add timeout, so query does not hang case server is unreachable (#514)

canonical · Aug 26, 2024 · 94fcb35 · 94fcb35
1 parent 3050548
commit 94fcb35
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/charms/mysql/v0/mysql.py b/lib/charms/mysql/v0/mysql.py
@@ -134,7 +134,7 @@ def wait_until_mysql_connection(self) -> None:
 # Increment this major API version when introducing breaking changes
 LIBAPI = 0
 
-LIBPATCH = 69
+LIBPATCH = 70
 
 UNIT_TEARDOWN_LOCKNAME = "unit-teardown"
 UNIT_ADD_LOCKNAME = "unit-add"
@@ -1536,7 +1536,9 @@ def cluster_metadata_exists(self, from_instance: str) -> bool:
         )
 
         try:
-            output = self._run_mysqlsh_script("\n".join(check_cluster_metadata_commands))
+            output = self._run_mysqlsh_script(
+                "\n".join(check_cluster_metadata_commands), timeout=10
+            )
         except MySQLClientError:
             logger.warning(f"Failed to check if cluster metadata exists {from_instance=}")
             return False

diff --git a/tests/unit/test_mysql.py b/tests/unit/test_mysql.py
@@ -956,7 +956,7 @@ def test_cluster_metadata_exists(self, _run_mysqlsh_script):
         _run_mysqlsh_script.return_value = "True\n"
 
         self.assertTrue(self.mysql.cluster_metadata_exists("1.2.3.4"))
-        _run_mysqlsh_script.assert_called_once_with(commands)
+        _run_mysqlsh_script.assert_called_once_with(commands, timeout=10)
 
         _run_mysqlsh_script.reset_mock()
         _run_mysqlsh_script.side_effect = MySQLClientError