Don't defer on raft removal

Author: dragomirp

src/charm.py

@@ -652,11 +652,7 @@ def _on_peer_relation_departed(self, event: RelationDepartedEvent) -> None:
             member_ip = self._patroni.get_member_ip(departing_member)
             self._patroni.remove_raft_member(member_ip)
         except RemoveRaftMemberFailedError:
-            logger.debug(
-                "Deferring on_peer_relation_departed: Failed to remove member from raft cluster"
-            )
-            event.defer()
-            return
+            logger.debug("on_peer_relation_departed: Failed to remove member from raft cluster")
         except RetryError:
             logger.warning(
                 f"Early exit on_peer_relation_departed: Cannot get {event.departing_unit.name} member IP"

src/cluster.py

@@ -963,8 +963,7 @@ def remove_raft_member(self, member_ip: str) -> None:
             raise RemoveRaftMemberFailedError() from None
 
         if not result.startswith("SUCCESS"):
-            logger.error(f"{result}")
-            logger.debug("Remove raft member: Remove call not successful")
+            logger.debug(f"Remove raft member: Remove call not successful with {result}")
             raise RemoveRaftMemberFailedError()
 
     @retry(stop=stop_after_attempt(20), wait=wait_exponential(multiplier=1, min=2, max=10))

tests/unit/test_charm.py

@@ -2176,7 +2176,7 @@ def test_on_peer_relation_departed(harness):
         _get_member_ip.return_value = mock_ip_address
         harness.charm._on_peer_relation_departed(event)
         _remove_raft_member.assert_called_once_with(mock_ip_address)
-        event.defer.assert_called_once()
+        # event.defer.assert_called_once()
         _updated_synchronous_node_count.assert_not_called()
         _get_ips_to_remove.assert_not_called()
         _remove_from_members_ips.assert_not_called()