Try to suppress oversee users

canonical · Jan 10, 2025 · da2a3db · da2a3db
1 parent 142bcd8
commit da2a3db
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/relations/db.py b/src/relations/db.py
@@ -184,10 +184,6 @@ def set_up_relation(self, relation: Relation) -> bool:
         if not database:
             database = relation.app.name
 
-        if not database:
-            logger.debug("No database or app name")
-            return
-
         try:
             unit_relation_databag = relation.data[self.charm.unit]
 

diff --git a/src/relations/postgresql_provider.py b/src/relations/postgresql_provider.py
@@ -130,7 +130,9 @@ def _on_relation_broken(self, event: RelationBrokenEvent) -> None:
 
     def oversee_users(self) -> None:
         """Remove users from database if their relations were broken."""
-        if not self.charm.unit.is_leader():
+        if not self.charm.unit.is_leader() or not isinstance(
+            self._charm.unit.status, ActiveStatus
+        ):
             return
 
         delete_user = "suppress-oversee-users" not in self.charm.app_peer_data

diff --git a/tests/integration/test_db_admin.py b/tests/integration/test_db_admin.py
@@ -57,6 +57,8 @@ async def test_landscape_scalable_bundle_db(ops_test: OpsTest, charm: str) -> No
         relation_name=RELATION_NAME,
         timeout=3000,
     )
+    await ops_test.model.wait_for_idle(apps=[DATABASE_APP_NAME], status="active", timeout=1000)
+
     await check_databases_creation(
         ops_test,
         [