Store MySQL server version in basebackup_info (basebackup.json)

Aiven-Open · Aug 19, 2024 · d5457d7 · d5457d7
1 parent 4bfc957
commit d5457d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/myhoard/backup_stream.py b/myhoard/backup_stream.py
@@ -11,6 +11,7 @@
     DEFAULT_XTRABACKUP_SETTINGS,
     ERR_TIMEOUT,
     first_contains_gtids_not_in_second,
+    get_mysql_version,
     GtidExecuted,
     make_fs_metadata,
     mysql_cursor,
@@ -978,10 +979,12 @@ def _take_basebackup(self) -> None:
             # FLUSH BINARY LOGS might take a long time if the server is under heavy load,
             # use longer than normal timeout here with multiple retries and increasing timeout.
             connect_params = dict(self.mysql_client_params)
+            mysql_version = None
             for retry, multiplier in [(True, 1), (True, 2), (False, 3)]:
                 try:
                     connect_params["timeout"] = DEFAULT_MYSQL_TIMEOUT * 5 * multiplier
                     with mysql_cursor(**connect_params) as cursor:
+                        mysql_version = get_mysql_version(cursor)
                         cursor.execute("FLUSH BINARY LOGS")
                         cursor.execute("SELECT @@GLOBAL.gtid_executed AS gtid_executed")
                         gtid_executed = parse_gtid_range_string(cast(dict, cursor.fetchone())["gtid_executed"])
@@ -1031,6 +1034,7 @@ def _take_basebackup(self) -> None:
                 "start_size": self.basebackup_operation.data_directory_size_start,
                 "start_ts": start_time,
                 "uploaded_from": self.server_id,
+                "mysql_version": mysql_version,
             }
             self.file_storage.store_file_from_memory(
                 self._build_full_name("basebackup.json"),

diff --git a/test/test_backup_stream.py b/test/test_backup_stream.py
@@ -116,6 +116,7 @@ def _run_backup_stream_test(session_tmpdir, mysql_master: MySQLConfig, backup_st
 
         assert bs.is_binlog_safe_to_delete(new_binlogs[0])
         assert bs.is_log_backed_up(log_index=new_binlogs[0]["local_index"])
+        assert bs.state["basebackup_info"].get("mysql_version") is not None
 
         # remote_gtid_executed will be updated once the stream notices the new binlog that was uploaded above
         wait_for_condition(lambda: bs_observer.state["remote_gtid_executed"] != gtid_executed)