From 9506198f371f1f4a66863ea944a863de4de5fd52 Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Thu, 2 Jul 2026 15:38:35 +0200 Subject: [PATCH 1/2] PS-11394 - Provide keyring config file in restore stage --- test_scripts/pxb/test_helper.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/test_scripts/pxb/test_helper.py b/test_scripts/pxb/test_helper.py index 2fb681e..ef15ebb 100644 --- a/test_scripts/pxb/test_helper.py +++ b/test_scripts/pxb/test_helper.py @@ -2676,7 +2676,7 @@ def run_keyring_component_backup(self, page_tracking: bool = False) -> None: if page_tracking: self.backup_params += " --page-tracking" self.prepare_params = f"{self.backup_params} --component-keyring-config={config_file}" - self.restore_params = self.backup_params + self.restore_params = f"{self.backup_params} --component-keyring-config={config_file}" if self.server_type == "MS": self.mysqld_options = "--innodb-undo-log-encrypt --innodb-redo-log-encrypt --default-table-encryption=ON --log-slave-updates --gtid-mode=ON --enforce-gtid-consistency --binlog-format=row --master_verify_checksum=ON --binlog_checksum=CRC32 --binlog-rotate-encryption-master-key-at-startup --table-encryption-privilege-check=ON --max-connections=5000 --binlog-encryption" @@ -2741,7 +2741,7 @@ def run_kmip_component_backup(self, vault_type: str) -> None: self.backup_params = f"--xtrabackup-plugin-dir={self.xtrabackup_dir}/../lib/plugin {CORE_FILE_OPT}" self.prepare_params = f"{self.backup_params} --component-keyring-config={kmip_cnf_dst}" - self.restore_params = self.backup_params + self.restore_params = f"{self.backup_params} --component-keyring-config={kmip_cnf_dst}" self.mysqld_options = "--innodb-undo-log-encrypt --innodb-redo-log-encrypt --default-table-encryption=ON --innodb_encrypt_online_alter_logs=ON --innodb_temp_tablespace_encrypt=ON --log-slave-updates --gtid-mode=ON --enforce-gtid-consistency --binlog-format=row --master_verify_checksum=ON --binlog_checksum=CRC32 --encrypt-tmp-files --table-encryption-privilege-check=ON --max-connections=5000" tool_options = f"--tables {self.num_tables} --records {self.table_size} --threads {self.threads} --seconds {self.seconds} --undo-tbs-sql 0" @@ -2787,7 +2787,7 @@ def run_kms_component_backup(self, page_tracking: bool = False) -> None: if page_tracking: self.backup_params += " --page-tracking" self.prepare_params = f"{self.backup_params} --component-keyring-config={config_file}" - self.restore_params = self.backup_params + self.restore_params = f"{self.backup_params} --component-keyring-config={config_file}" self.mysqld_options = ( "--innodb-undo-log-encrypt --innodb-redo-log-encrypt --default-table-encryption=ON " @@ -2965,7 +2965,9 @@ def run_crash_tests_pstress_encrypted( self.prepare_params = ( f"{self.backup_params} --component-keyring-config={keyring_config_file}" ) - self.restore_params = self.backup_params + self.restore_params = ( + f"{self.backup_params} --component-keyring-config={keyring_config_file}" + ) if self.server_type == "MS": self.mysqld_options = ( "--innodb-undo-log-encrypt --innodb-redo-log-encrypt " @@ -3025,7 +3027,9 @@ def run_crash_tests_pstress_encrypted( self.prepare_params = ( f"{self.backup_params} --component-keyring-config={keyring_config_file}" ) - self.restore_params = self.backup_params + self.restore_params = ( + f"{self.backup_params} --component-keyring-config={keyring_config_file}" + ) self.mysqld_options = ( "--innodb-undo-log-encrypt --innodb-redo-log-encrypt " "--default-table-encryption=ON --innodb_encrypt_online_alter_logs=ON " From beb2136ce1493334ff9dbc44a2acf5f07ea3a712 Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Thu, 2 Jul 2026 15:42:06 +0200 Subject: [PATCH 2/2] Remove unused sys import --- test_scripts/pxb/test_helper.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test_scripts/pxb/test_helper.py b/test_scripts/pxb/test_helper.py index ef15ebb..3e582c0 100644 --- a/test_scripts/pxb/test_helper.py +++ b/test_scripts/pxb/test_helper.py @@ -5,7 +5,6 @@ """ import os -import sys import subprocess import time import shutil