Decrement mysql libpatch from 59 to 58 to match published version on charmhub (#449)

* Decrement mysql libpatch from 59 to 58 to match published version on charmhub

* Update rollingops charmlib to v0.7

Author: shayancanonical

lib/charms/mysql/v0/mysql.py

@@ -116,7 +116,7 @@ def wait_until_mysql_connection(self) -> None:
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 59
+LIBPATCH = 58
 
 UNIT_TEARDOWN_LOCKNAME = "unit-teardown"
 UNIT_ADD_LOCKNAME = "unit-add"

lib/charms/rolling_ops/v0/rollingops.py

@@ -88,7 +88,7 @@ def _on_trigger_restart(self, event):
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 6
+LIBPATCH = 7
 
 
 class LockNoRelationError(Exception):
@@ -318,6 +318,7 @@ def __init__(self, charm: CharmBase, relation: AnyStr, callback: Callable):
         self.framework.observe(charm.on[self.name].acquire_lock, self._on_acquire_lock)
         self.framework.observe(charm.on[self.name].run_with_lock, self._on_run_with_lock)
         self.framework.observe(charm.on[self.name].process_locks, self._on_process_locks)
+        self.framework.observe(charm.on.leader_elected, self._on_process_locks)
 
     def _callback(self: CharmBase, event: EventBase) -> None:
         """Placeholder for the function that actually runs our event.

tests/unit/test_async_replication.py

@@ -26,6 +26,7 @@
 from .helpers import patch_network_get
 
 
+@patch("charms.rolling_ops.v0.rollingops.RollingOpsManager._on_process_locks")
 class TestAsyncRelation(unittest.TestCase):
     def setUp(self) -> None:
         self.harness = Harness(MySQLOperatorCharm)
@@ -37,7 +38,7 @@ def setUp(self) -> None:
         self.async_replica = self.charm.async_replica
 
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_role(self, _mysql):
+    def test_role(self, _mysql, _):
         _mysql.is_cluster_replica.return_value = True
         _mysql.get_member_state.return_value = (None, "primary")
         self.async_primary_relation_id = self.harness.add_relation(PRIMARY_RELATION, "db2")
@@ -55,7 +56,7 @@ def test_role(self, _mysql):
         del self.async_primary.role
 
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_async_relation_broken_primary(self, _mysql):
+    def test_async_relation_broken_primary(self, _mysql, _):
         self.harness.set_leader(True)
         self.charm.on.config_changed.emit()
         self.async_primary_relation_id = self.harness.add_relation(PRIMARY_RELATION, "db2")
@@ -77,7 +78,7 @@ def test_async_relation_broken_primary(self, _mysql):
         )
 
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_async_relation_broken_replica(self, _mysql):
+    def test_async_relation_broken_replica(self, _mysql, _):
         self.harness.set_leader(True)
         self.charm.on.config_changed.emit()
         async_primary_relation_id = self.harness.add_relation(PRIMARY_RELATION, "db2")
@@ -93,7 +94,7 @@ def test_async_relation_broken_replica(self, _mysql):
         self.assertNotIn("units-added-to-cluster", self.charm.app_peer_data)
 
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_get_state(self, _mysql):
+    def test_get_state(self, _mysql, _):
         async_primary_relation_id = self.harness.add_relation(PRIMARY_RELATION, "db2")
         relation = self.harness.model.get_relation(PRIMARY_RELATION, async_primary_relation_id)
         assert relation
@@ -127,7 +128,7 @@ def test_get_state(self, _mysql):
 
     @pytest.mark.usefixtures("with_juju_secrets")
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_primary_created(self, _mysql):
+    def test_primary_created(self, _mysql, _):
         self.harness.set_leader(True)
         self.charm.on.config_changed.emit()
 
@@ -150,7 +151,7 @@ def test_primary_created(self, _mysql):
 
     @patch("charms.mysql.v0.async_replication.MySQLAsyncReplicationPrimary.get_state")
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_primary_relation_changed(self, _mysql, _get_state):
+    def test_primary_relation_changed(self, _mysql, _get_state, _):
         self.harness.set_leader(True)
         async_primary_relation_id = self.harness.add_relation(PRIMARY_RELATION, "db2")
 
@@ -203,7 +204,7 @@ def test_primary_relation_changed(self, _mysql, _get_state):
         self.assertTrue(isinstance(self.charm.unit.status, MaintenanceStatus))
 
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_state(self, _mysql):
+    def test_state(self, _mysql, _):
         """Test async replica state property."""
         self.assertIsNone(self.async_replica.state)
 
@@ -239,7 +240,7 @@ def test_state(self, _mysql):
         self.assertEqual(self.async_replica.state, States.FAILED)
 
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_replica_created(self, _mysql):
+    def test_replica_created(self, _mysql, _):
         """Test replica creation."""
         self.harness.set_leader(True)
         self.charm.on.config_changed.emit()
@@ -255,7 +256,7 @@ def test_replica_created(self, _mysql):
         self.assertTrue(isinstance(self.charm.unit.status, WaitingStatus))
 
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_replica_created_user_data(self, _mysql):
+    def test_replica_created_user_data(self, _mysql, _):
         """Test replica creation."""
         self.harness.set_leader(True)
         self.charm.on.config_changed.emit()
@@ -284,7 +285,7 @@ def test_replica_created_user_data(self, _mysql):
         new_callable=PropertyMock,
     )
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_replica_changed_syncing(self, _mysql, _state, _returning_cluster, _defer):
+    def test_replica_changed_syncing(self, _mysql, _state, _returning_cluster, _defer, _):
         """Test replica changed for syncing state."""
         self.harness.set_leader(True)
         self.charm.on.config_changed.emit()
@@ -361,7 +362,7 @@ def test_replica_changed_syncing(self, _mysql, _state, _returning_cluster, _defe
         new_callable=PropertyMock,
     )
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_replica_changed_ready(self, _mysql, _state, _update_status):
+    def test_replica_changed_ready(self, _mysql, _state, _update_status, _):
         """Test replica changed for ready state."""
         self.harness.set_leader(True)
         self.charm.on.config_changed.emit()
@@ -385,7 +386,7 @@ def test_replica_changed_ready(self, _mysql, _state, _update_status):
         new_callable=PropertyMock,
     )
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_replica_changed_recovering(self, _mysql, _state, _defer):
+    def test_replica_changed_recovering(self, _mysql, _state, _defer, _):
         """Test replica changed for ready state."""
         self.harness.set_leader(True)
         self.charm.on.config_changed.emit()
@@ -403,7 +404,7 @@ def test_replica_changed_recovering(self, _mysql, _state, _defer):
         self.assertEqual(self.charm.app_peer_data["units-added-to-cluster"], "2")
         _defer.assert_called_once()
 
-    def test_replica_created_non_leader(self):
+    def test_replica_created_non_leader(self, _):
         """Test replica changed for non-leader unit."""
         self.harness.set_leader(False)
         self.charm.unit_peer_data["member-state"] = "online"
@@ -412,7 +413,7 @@ def test_replica_created_non_leader(self):
         self.assertEqual(self.charm.unit_peer_data["member-state"], "waiting")
 
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_replica_changed_non_leader(self, _mysql):
+    def test_replica_changed_non_leader(self, _mysql, _):
         """Test replica changed for non-leader unit."""
         self.harness.set_leader(False)
         with self.harness.hooks_disabled():
@@ -430,7 +431,7 @@ def test_replica_changed_non_leader(self, _mysql):
 
     # actions
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_promote_standby_cluster(self, _mysql):
+    def test_promote_standby_cluster(self, _mysql, _):
         self.harness.set_leader(True)
 
         _mysql.is_cluster_replica.return_value = True
@@ -460,7 +461,7 @@ def test_promote_standby_cluster(self, _mysql):
 
     @patch("charm.MySQLOperatorCharm._on_update_status")
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_fence_cluster(self, _mysql, _update_status):
+    def test_fence_cluster(self, _mysql, _update_status, _):
         self.harness.set_leader(True)
         # fail on wrong cluster set name
         with self.assertRaises(ActionFailed):
@@ -504,7 +505,7 @@ def test_fence_cluster(self, _mysql, _update_status):
 
     @patch("charm.MySQLOperatorCharm._on_update_status")
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_unfence_cluster(self, _mysql, _update_status):
+    def test_unfence_cluster(self, _mysql, _update_status, _):
         self.harness.set_leader(True)
 
         _mysql.is_cluster_replica.return_value = False
@@ -523,7 +524,7 @@ def test_unfence_cluster(self, _mysql, _update_status):
         _update_status.assert_called_once()
 
     @patch("charm.MySQLOperatorCharm._mysql")
-    def test_rejoin_cluster_action(self, _mysql):
+    def test_rejoin_cluster_action(self, _mysql, _):
         with self.assertRaises(ActionFailed):
             self.harness.run_action("rejoin-cluster")
 

tests/unit/test_backups.py

@@ -39,7 +39,8 @@ def setUp(self):
         self.addCleanup(self.harness.cleanup)
         self.harness.begin()
         self.peer_relation_id = self.harness.add_relation("database-peers", "database-peers")
-        self.harness.set_leader(True)
+        with patch("charms.rolling_ops.v0.rollingops.RollingOpsManager._on_process_locks") as _:
+            self.harness.set_leader(True)
         self.harness.charm.on.config_changed.emit()
         self.charm = self.harness.charm
         self.s3_integrator_id = self.harness.add_relation(
@@ -319,9 +320,6 @@ def test_can_unit_perform_backup(
         _offline_mode_and_hidden_instance_exists,
     ):
         """Test _can_unit_perform_backup()."""
-        self.harness.set_leader(True)
-        self.charm.on.config_changed.emit()
-
         success, error_message = self.mysql_backups._can_unit_perform_backup()
         self.assertTrue(success)
         self.assertIsNone(error_message)

tests/unit/test_database.py

@@ -41,7 +41,8 @@ def test_database_requested(
         _get_mysql_version,
     ):
         # run start-up events to enable usage of the helper class
-        self.harness.set_leader(True)
+        with patch("charms.rolling_ops.v0.rollingops.RollingOpsManager._on_process_locks") as _:
+            self.harness.set_leader(True)
         self.charm.on.config_changed.emit()
 
         # confirm that the relation databag is empty

tests/unit/test_db_router.py

@@ -17,6 +17,7 @@
 from .helpers import patch_network_get
 
 
+@patch("charms.rolling_ops.v0.rollingops.RollingOpsManager._on_process_locks")
 class TestDBRouter(unittest.TestCase):
     def setUp(self):
         self.harness = Harness(MySQLOperatorCharm)
@@ -41,6 +42,7 @@ def test_db_router_relation_changed(
         _does_mysql_user_exist,
         _get_cluster_primary_address,
         _generate_random_password,
+        _,
     ):
         # run start-up events to enable usage of the helper class
         self.harness.set_leader(True)
@@ -128,6 +130,7 @@ def test_db_router_relation_changed_exceptions(
         _configure_mysqlrouter_user,
         _does_mysql_user_exist,
         _generate_random_password,
+        _,
     ):
         # run start-up events to enable usage of the helper class
         self.harness.set_leader(True)

tests/unit/test_relation_mysql_legacy.py

@@ -13,6 +13,7 @@
 from .helpers import patch_network_get
 
 
+@patch("charms.rolling_ops.v0.rollingops.RollingOpsManager._on_process_locks")
 class TestMariaDBRelation(unittest.TestCase):
     def setUp(self):
         self.harness = Harness(MySQLOperatorCharm)
@@ -37,6 +38,7 @@ def test_maria_db_relation_created(
         _get_or_set_password_in_peer_secrets,
         _get_cluster_primary_address,
         _does_mysql_user_exist,
+        _,
     ):
         # run start-up events to enable usage of the helper class
         self.harness.set_leader(True)
@@ -92,6 +94,7 @@ def test_maria_db_relation_created_with_secrets(
         _get_or_set_password_in_peer_secrets,
         _get_cluster_primary_address,
         _does_mysql_user_exist,
+        _,
     ):
         # run start-up events to enable usage of the helper class
         self.harness.set_leader(True)
@@ -151,6 +154,7 @@ def test_maria_db_relation_departed(
         _delete_users_for_unit,
         _get_cluster_primary_address,
         _does_mysql_user_exist,
+        _,
     ):
         # run start-up events to enable usage of the helper class
         self.harness.set_leader(True)

tests/unit/test_shared_db.py

@@ -14,6 +14,7 @@
 from .helpers import patch_network_get
 
 
+@patch("charms.rolling_ops.v0.rollingops.RollingOpsManager._on_process_locks")
 class TestSharedDBRelation(unittest.TestCase):
     def setUp(self):
         self.harness = Harness(MySQLOperatorCharm)
@@ -34,6 +35,7 @@ def test_shared_db_relation_changed(
         _create_application_database_and_scoped_user,
         _generate_random_password,
         _get_cluster_primary_address,
+        _,
     ):
         # run start-up events to enable usage of the helper class
         self.harness.set_leader(True)
@@ -89,7 +91,7 @@ def test_shared_db_relation_changed(
     @patch("utils.generate_random_password", return_value="super_secure_password")
     @patch("mysql_vm_helpers.MySQL.create_application_database_and_scoped_user")
     def test_shared_db_relation_changed_error_on_user_creation(
-        self, _create_application_database_and_scoped_user, _generate_random_password
+        self, _create_application_database_and_scoped_user, _generate_random_password, _
     ):
         # run start-up events to enable usage of the helper class
         self.harness.set_leader(True)
@@ -123,6 +125,7 @@ def test_shared_db_relation_departed(
         _generate_random_password,
         _delete_users_for_unit,
         _get_cluster_primary_address,
+        _,
     ):
         # run start-up events to enable usage of the helper class
         self.harness.set_leader(True)

tests/unit/test_upgrade.py

@@ -60,11 +60,12 @@ def test_build_upgrade_stack(self):
         self.assertTrue(len(us) == 3)
         self.assertEqual(us, [0, 1, 2])
 
+    @patch("charms.rolling_ops.v0.rollingops.RollingOpsManager._on_process_locks")
     @patch("charm.MySQLOperatorCharm.get_unit_ip", return_value="10.0.1.1")
     @patch("upgrade.MySQLVMUpgrade._pre_upgrade_prepare")
     @patch("mysql_vm_helpers.MySQL.get_cluster_status", return_value=MOCK_STATUS_ONLINE)
     def test_pre_upgrade_check(
-        self, mock_get_cluster_status, mock_pre_upgrade_prepare, mock_get_unit_ip
+        self, mock_get_cluster_status, mock_pre_upgrade_prepare, mock_get_unit_ip, _
     ):
         """Test the pre upgrade check."""
         self.harness.set_leader(True)
@@ -107,6 +108,7 @@ def test_log_rollback(self, mock_logging):
         ]
         mock_logging.assert_has_calls(calls)
 
+    @patch("charms.rolling_ops.v0.rollingops.RollingOpsManager._on_process_locks")
     @patch("charm.MySQLOperatorCharm.get_unit_ip", return_value="10.0.1.1")
     @patch("mysql_vm_helpers.MySQL.set_dynamic_variable")
     @patch("mysql_vm_helpers.MySQL.get_primary_label", return_value="mysql-1")
@@ -117,6 +119,7 @@ def test_pre_upgrade_prepare(
         mock_get_primary_label,
         mock_set_dynamic_variable,
         mock_get_unit_ip,
+        _,
     ):
         """Test the pre upgrade prepare."""
         self.harness.set_leader(True)
@@ -261,8 +264,9 @@ def test_reset_on_unsupported_downgrade(
         self.assertEqual(self.charm.unit_peer_data["member-role"], "secondary")
         self.assertEqual(self.charm.unit_peer_data["member-state"], "waiting")
 
+    @patch("charms.rolling_ops.v0.rollingops.RollingOpsManager._on_process_locks")
     @patch("upgrade.MySQLVMUpgrade._prepare_upgrade_from_legacy")
-    def test_upgrade_charm_legacy(self, mock_prepare_upgrade_from_legacy):
+    def test_upgrade_charm_legacy(self, mock_prepare_upgrade_from_legacy, _):
         self.harness.update_relation_data(self.upgrade_relation_id, "mysql/0", {"state": ""})
 
         # non leader