Stabilisation...

Author: taurus-forever

src/charm.py

@@ -862,9 +862,6 @@ def _peer_relation_changed_checks(self, event: HookEvent) -> bool:
         """Split of to reduce complexity."""
         # Prevents the cluster to be reconfigured before it's bootstrapped in the leader.
         logger.debug(f"Calling on_peer_relation_changed, event: '{event}'")
-        if hasattr(event, "unit") and event.unit is None:
-            logger.debug(f"Early exit on_peer_relation_changed: event to itself ({event.unit})")
-            return False
 
         if not self.is_cluster_initialised:
             logger.debug("Early exit on_peer_relation_changed: cluster not initialized")
@@ -883,7 +880,9 @@ def _peer_relation_changed_checks(self, event: HookEvent) -> bool:
 
         # Don't update this member before it's part of the members list.
         if self._unit_ip not in self.members_ips:
-            logger.debug("Early exit on_peer_relation_changed: Unit not in the members list")
+            logger.debug(
+                "Early exit on_peer_relation_changed: Unit not in the members list {self.members_ips}"
+            )
             return False
         return True
 
@@ -2357,7 +2356,7 @@ def update_config(
             parameters=pg_parameters,
             no_peers=no_peers,
             user_databases_map=self.relations_user_databases_map,
-            slots=replication_slots or None,
+            slots=replication_slots,
         )
         if no_peers:
             logger.debug("Early exit update_config: no peers")

src/cluster.py

@@ -15,6 +15,7 @@
 from contextlib import suppress
 from pathlib import Path
 from ssl import CERT_NONE, create_default_context
+from time import sleep
 from typing import TYPE_CHECKING, Any, TypedDict
 
 import charm_refresh
@@ -442,6 +443,10 @@ def get_patroni_health(self) -> dict[str, str]:
 
     def is_restart_pending(self) -> bool:
         """Returns whether the Patroni/PostgreSQL restart pending."""
+        # The current Patroni 3.2.2 has wired behaviour: it temporary flag pending_restart=True
+        # on any changes to REST API, which is gone within a second but long enough to be
+        # cougth by charm. Sleep 2 seconds as a protection here until Patroni 3.3.0 upgrade
+        sleep(2)
         r = requests.get(
             f"{self._patroni_url}/patroni",
             verify=self.verify,

templates/patroni.yml.j2

@@ -101,15 +101,13 @@ bootstrap:
         set_user.block_log_statement: 'on'
         set_user.exit_on_error: 'on'
         set_user.superuser_allowlist: '+charmed_dba'
-    {%- if slots %}
     slots:
     {%- for slot, database in slots.items() %}
       {{slot}}:
         database: {{database}}
         plugin: pgoutput
         type: logical
     {%- endfor -%}
-    {% endif %}
 
   {%- if restoring_backup %}
   method: pgbackrest

tests/unit/test_charm.py

@@ -1163,7 +1163,7 @@ class _MockSnap:
             parameters={"test": "test"},
             no_peers=False,
             user_databases_map={"operator": "all", "replication": "all", "rewind": "all"},
-            slots=None,
+            slots={},
         )
         _handle_postgresql_restart_need.assert_called_once_with()
         _restart_ldap_sync_service.assert_called_once()
@@ -1194,7 +1194,7 @@ class _MockSnap:
             parameters={"test": "test"},
             no_peers=False,
             user_databases_map={"operator": "all", "replication": "all", "rewind": "all"},
-            slots=None,
+            slots={},
         )
         _handle_postgresql_restart_need.assert_called_once()
         _restart_ldap_sync_service.assert_called_once()