[DPE-9448] Don't override upgrade status

src/charm.py

@@ -1051,6 +1051,8 @@ def _set_active_status(self):
                     self.app_peer_data["s3-initialization-block-message"]
                 )
                 return
+            if not self.upgrade.idle:
+                return
             if (
                 self._patroni.get_primary(unit_name_pattern=True) == self.unit.name
                 or self.is_standby_leader

src/ldap.py

@@ -11,9 +11,7 @@
     LdapRequirer,
     LdapUnavailableEvent,
 )
-from ops import Relation
-from ops.framework import Object
-from ops.model import ActiveStatus
+from ops import Object, Relation
 
 logger = logging.getLogger(__name__)
 
@@ -44,7 +42,7 @@ def _on_ldap_ready(self, _: LdapReadyEvent) -> None:
             self.charm.app_peer_data.update({"ldap_enabled": "True"})
 
         self.charm.update_config()
-        self.charm.unit.status = ActiveStatus()
+        self.charm._set_active_status()
 
     def _on_ldap_unavailable(self, _: LdapUnavailableEvent) -> None:
         """Handler for the LDAP unavailable event."""

src/relations/db.py

@@ -13,14 +13,17 @@
     PostgreSQLDeleteUserError,
     PostgreSQLGetPostgreSQLVersionError,
 )
-from ops.charm import (
+from ops import (
+    ActiveStatus,
+    BlockedStatus,
     CharmBase,
+    Object,
+    Relation,
     RelationBrokenEvent,
     RelationChangedEvent,
     RelationDepartedEvent,
+    Unit,
 )
-from ops.framework import Object
-from ops.model import ActiveStatus, BlockedStatus, Relation, Unit
 from pgconnstr import ConnectionString
 
 from constants import (

src/relations/postgresql_provider.py

@@ -18,9 +18,16 @@
     PostgreSQLDeleteUserError,
     PostgreSQLGetPostgreSQLVersionError,
 )
-from ops.charm import CharmBase, RelationBrokenEvent, RelationChangedEvent, RelationDepartedEvent
-from ops.framework import Object
-from ops.model import ActiveStatus, BlockedStatus, Relation
+from ops import (
+    ActiveStatus,
+    BlockedStatus,
+    CharmBase,
+    Object,
+    Relation,
+    RelationBrokenEvent,
+    RelationChangedEvent,
+    RelationDepartedEvent,
+)
 
 from constants import DATABASE_PORT, ENDPOINT_SIMULTANEOUSLY_BLOCKING_MESSAGE
 from utils import new_password

tests/unit/test_charm.py

@@ -615,6 +615,7 @@ def test_enable_disable_extensions(harness):
             return_value=False,
             new_callable=PropertyMock,
         ),
+        patch("charm.PostgreSQLUpgrade.idle", new_callable=PropertyMock, return_value=True),
     ):
         # Early exit if no primary
         harness.charm.enable_disable_extensions()
@@ -1718,6 +1719,7 @@ def test_set_active_status(harness):
             "charm.PostgresqlOperatorCharm.is_standby_leader", new_callable=PropertyMock
         ) as _is_standby_leader,
         patch("charm.Patroni.get_primary") as _get_primary,
+        patch("charm.PostgreSQLUpgrade.idle", new_callable=PropertyMock, return_value=True),
     ):
         for values in itertools.product(
             [