PXB-3368 Fix jenkins test failures

Fix keyring test failures by replacing keyring_file to keyring_component
percona · Sep 19, 2024 · e525a8f · e525a8f
1 parent 7d82843
commit e525a8f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/storage/innobase/xtrabackup/src/backup_mysql.cc b/storage/innobase/xtrabackup/src/backup_mysql.cc
@@ -1682,8 +1682,8 @@ static void log_status_replication_parse(const char *s,
     cs.relay_log_file = ch["relay_log_file"].GetString();
     cs.relay_log_position = ch["relay_log_position"].GetUint64();
     if (server_flavor == FLAVOR_PERCONA_SERVER) {
-      cs.relay_master_log_file = ch["relay_source_log_file"].GetString();
-      cs.exec_master_log_position = ch["exec_source_log_position"].GetUint64();
+      cs.relay_master_log_file = ch["relay_master_log_file"].GetString();
+      cs.exec_master_log_position = ch["exec_master_log_position"].GetUint64();
     }
     log_status.channels.push_back(cs);
   }

diff --git a/storage/innobase/xtrabackup/test/suites/keyring/pxb-1793.sh b/storage/innobase/xtrabackup/test/suites/keyring/pxb-1793.sh
@@ -15,9 +15,10 @@ innodb_temp_tablespace_encrypt=ON
 encrypt-tmp-files
 "
 
+KEYRING_TYPE="component"
+. inc/keyring_common.sh
 . inc/keyring_file.sh
-
-start_server
+configure_server_with_component
 
 # backup fails if bug is present
 xtrabackup --backup --target-dir=$topdir/backup
diff --git a/storage/innobase/xtrabackup/test/suites/keyring/shared_tablespace_encryption.sh b/storage/innobase/xtrabackup/test/suites/keyring/shared_tablespace_encryption.sh
@@ -10,9 +10,10 @@ innodb-sys-tablespace-encrypt
 loose-innodb-default-encryption=on
 "
 
+KEYRING_TYPE="component"
+. inc/keyring_common.sh
 . inc/keyring_file.sh
-
-start_server
+configure_server_with_component
 
 mysql -e "CREATE TABLE t (a INT PRIMARY KEY, b TEXT)" test
 mysql -e "INSERT INTO t (a, b) VALUES (1, 'a')" test
@@ -26,7 +27,11 @@ stop_server
 
 rm -rf $mysql_datadir
 
-xtrabackup --copy-back --transition-key=1234 --generate-new-master-key --target-dir=$topdir/backup
+xtrabackup --copy-back --transition-key=1234 --generate-new-master-key --target-dir=$topdir/backup \
+               --xtrabackup-plugin-dir=${plugin_dir} ${keyring_args}
+
+cp ${instance_local_manifest}  $mysql_datadir
+cp ${keyring_component_cnf} $mysql_datadir
 
 start_server
 
@@ -43,7 +48,10 @@ stop_server
 
 rm -rf $mysql_datadir
 
-xtrabackup --copy-back --target-dir=$topdir/backup
+xtrabackup --copy-back --target-dir=$topdir/backup --xtrabackup-plugin-dir=${plugin_dir} ${keyring_args}
+
+cp ${instance_local_manifest}  $mysql_datadir
+cp ${keyring_component_cnf} $mysql_datadir
 
 start_server