Merge ~arturo-seijas/postgresql-charm:fix-unknown-option-wal-keep-segments into postgresql-charm:master

[Arturo Enrique Seijas Fernández]

Fix unknown option was_keep_segments in Jammy

was_keep_segments and replicated_wal_keep_segments have been renamed to wal_keep_size and replicated_wal_keep_size and in PostgreSQL 14

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

I'd be surprised if this works - you're referencing `config["replicated_wal_keep_size"]` but I don't see that as a config option (in `config.yaml`) - only `replicated_wal_keep_segments`.

Can you test and confirm?

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision f95c875da4280b477a97c0e1f86911d2ba69c0f7

diff --git a/reactive/postgresql/service.py b/reactive/postgresql/service.py
index d42cbbf..d1a7f62 100644
--- a/reactive/postgresql/service.py
+++ b/reactive/postgresql/service.py
@@ -20,22 +20,16 @@ import subprocess
 import textwrap
 import time
 
+import context
 import yaml
-
 from charmhelpers.core import hookenv, host, sysctl, templating, unitdata
 from charmhelpers.core.hookenv import DEBUG, WARNING
 from charms import apt, coordinator, reactive
 from charms.reactive import hook, when, when_any, when_not
-
-import context
 from everyhook import everyhook
 
+from reactive.postgresql import helpers, nagios, postgresql, replication, wal_e
 from reactive.workloadstatus import status_set
-from reactive.postgresql import helpers
-from reactive.postgresql import nagios
-from reactive.postgresql import postgresql
-from reactive.postgresql import replication
-from reactive.postgresql import wal_e
 
 
 @hook("install")
@@ -732,7 +726,14 @@ def ensure_viable_postgresql_conf(opts):
 
     # Having two config options for the one setting is confusing. Perhaps
     # we should deprecate this.
-    if num_standbys and (int(config["replicated_wal_keep_segments"]) > int(opts.get("wal_keep_segments", 0))):
+    # PostgreSQL 14 renames wal_keep_segments to wal_keep_size and
+    # replicated_wal_keep_segments to replicated_wal_keep_size.
+    # Note that for version 14 the charm does not set a default for these configs.
+    if (
+        not postgresql.has_version("14")
+        and num_standbys
+        and (int(config["replicated_wal_keep_segments"]) > int(opts.get("wal_keep_segments", 0)))
+    ):
         force(wal_keep_segments=config["replicated_wal_keep_segments"])
 
     # Log shipping with WAL-E.