Move status.clear to be at the end of config_changed

canonical · Jun 14, 2024 · ec15f2e · ec15f2e
1 parent 8b3f15c
commit ec15f2e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/charms/opensearch/v0/opensearch_base_charm.py b/lib/charms/opensearch/v0/opensearch_base_charm.py
@@ -656,13 +656,14 @@ def _on_config_changed(self, event: ConfigChangedEvent):  # noqa C901
             if self.unit.is_leader() and isinstance(e, OpenSearchPluginError):
                 self.status.set(BlockedStatus(PluginConfigChangeError), app=True)
             event.defer()
+            return
         except OpenSearchKeystoreNotReadyYetError:
             logger.warning("Keystore not ready yet")
             event.defer()
-        else:
-            if self.unit.is_leader():
-                self.status.clear(PluginConfigChangeError, app=True)
-                self.status.clear(PluginConfigCheck, new_status=original_status, app=True)
+
+        if self.unit.is_leader():
+            self.status.clear(PluginConfigChangeError, app=True)
+            self.status.clear(PluginConfigCheck, new_status=original_status, app=True)
 
     def _on_set_password_action(self, event: ActionEvent):
         """Set new admin password from user input or generate if not passed."""