From a5d0be836b467085a50e6eb17ea41c61fc744504 Mon Sep 17 00:00:00 2001 From: Paulo Machado Date: Wed, 18 Sep 2024 18:08:02 -0300 Subject: [PATCH 1/2] skip tls reconfiguration on unit removal --- lib/charms/mysql/v0/tls.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/charms/mysql/v0/tls.py b/lib/charms/mysql/v0/tls.py index 85586d561..8d1e13ad6 100644 --- a/lib/charms/mysql/v0/tls.py +++ b/lib/charms/mysql/v0/tls.py @@ -51,7 +51,7 @@ LIBID = "eb73947deedd4380a3a90d527e0878eb" LIBAPI = 0 -LIBPATCH = 7 +LIBPATCH = 8 SCOPE = "unit" @@ -174,6 +174,9 @@ def _on_tls_relation_broken(self, _) -> None: except KeyError: # ignore key error for unit teardown pass + if self.charm.removing_unit: + logger.debug("Unit is being removed, skipping TLS cleanup.") + return try: self.charm._mysql.tls_setup() self.charm.unit_peer_data.pop("tls") From d81ee70d3e9b84be63927ff5e94b2697e3da9fa1 Mon Sep 17 00:00:00 2001 From: Paulo Machado Date: Thu, 19 Sep 2024 16:49:19 -0300 Subject: [PATCH 2/2] no op handler on unit tear down --- lib/charms/mysql/v0/tls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/charms/mysql/v0/tls.py b/lib/charms/mysql/v0/tls.py index 8d1e13ad6..be550291f 100644 --- a/lib/charms/mysql/v0/tls.py +++ b/lib/charms/mysql/v0/tls.py @@ -166,6 +166,9 @@ def _on_certificate_expiring(self, event: CertificateExpiringEvent) -> None: def _on_tls_relation_broken(self, _) -> None: """Disable TLS when TLS relation broken.""" + if self.charm.removing_unit: + logger.debug("Unit is being removed, skipping TLS cleanup.") + return try: if not ops.jujuversion.JujuVersion.from_environ().has_secrets: self.charm.set_secret(SCOPE, "certificate-authority", None) @@ -174,9 +177,6 @@ def _on_tls_relation_broken(self, _) -> None: except KeyError: # ignore key error for unit teardown pass - if self.charm.removing_unit: - logger.debug("Unit is being removed, skipping TLS cleanup.") - return try: self.charm._mysql.tls_setup() self.charm.unit_peer_data.pop("tls")