[DPE-4990] Fix PITR test on Juju 2.9 (#596)

* Fix PITR test on Juju 2.9 Signed-off-by: Marcelo Henrique Neppel <[email protected]> * Avoid status override Signed-off-by: Marcelo Henrique Neppel <[email protected]> --------- Signed-off-by: Marcelo Henrique Neppel <[email protected]>
canonical · Jul 30, 2024 · 807d9f8 · 807d9f8
1 parent f4e0b7a
commit 807d9f8
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/src/charm.py b/src/charm.py
@@ -54,7 +54,15 @@
     UnknownStatus,
     WaitingStatus,
 )
-from ops.pebble import ChangeError, Layer, PathError, ProtocolError, ServiceInfo, ServiceStatus
+from ops.pebble import (
+    ChangeError,
+    ExecError,
+    Layer,
+    PathError,
+    ProtocolError,
+    ServiceInfo,
+    ServiceStatus,
+)
 from requests import ConnectionError
 from tenacity import RetryError, Retrying, stop_after_attempt, stop_after_delay, wait_fixed
 
@@ -1348,8 +1356,9 @@ def _was_restore_successful(self, container: Container, service: ServiceInfo) ->
                 self.unit.status = BlockedStatus(CANNOT_RESTORE_PITR)
                 return False
 
-            logger.error("Restore failed: database service failed to start")
-            self.unit.status = BlockedStatus("Failed to restore backup")
+            if self.unit.status.message != CANNOT_RESTORE_PITR:
+                logger.error("Restore failed: database service failed to start")
+                self.unit.status = BlockedStatus("Failed to restore backup")
             return False
 
         if not self._patroni.member_started:
@@ -2021,13 +2030,22 @@ def is_pitr_failed(self, container: Container) -> Tuple[bool, bool]:
                 - Is patroni service failed to bootstrap cluster.
                 - Is it new fail, that wasn't observed previously.
         """
-        log_exec = container.pebble.exec(["pebble", "logs", "postgresql"], combine_stderr=True)
-        patroni_logs = log_exec.wait_output()[0]
-        patroni_exceptions = re.findall(
-            r"^([0-9-:TZ.]+) \[postgresql] patroni\.exceptions\.PatroniFatalException: Failed to bootstrap cluster$",
-            patroni_logs,
-            re.MULTILINE,
-        )
+        try:
+            log_exec = container.pebble.exec(["pebble", "logs", "postgresql"], combine_stderr=True)
+            patroni_logs = log_exec.wait_output()[0]
+            patroni_exceptions = re.findall(
+                r"^([0-9-:TZ.]+) \[postgresql] patroni\.exceptions\.PatroniFatalException: Failed to bootstrap cluster$",
+                patroni_logs,
+                re.MULTILINE,
+            )
+        except ExecError:  # For Juju 2.
+            log_exec = container.pebble.exec(["cat", "/var/log/postgresql/patroni.log"])
+            patroni_logs = log_exec.wait_output()[0]
+            patroni_exceptions = re.findall(
+                r"^([0-9- :]+) UTC \[[0-9]+\]: INFO: removing initialize key after failed attempt to bootstrap the cluster",
+                patroni_logs,
+                re.MULTILINE,
+            )
         if len(patroni_exceptions) > 0:
             old_pitr_fail_id = self.unit_peer_data.get("last_pitr_fail_id", None)
             self.unit_peer_data["last_pitr_fail_id"] = patroni_exceptions[-1]