From 4ecd8368866187a5eca5f5ed34595c7e55c979de Mon Sep 17 00:00:00 2001 From: "vitess-bot[bot]" <108069721+vitess-bot[bot]@users.noreply.github.com> Date: Thu, 22 Jan 2026 19:54:38 +0000 Subject: [PATCH 1/2] CI: Look for expected log message rather than code in Backup tests (#19199) Signed-off-by: Matt Lord --- go/test/endtoend/backup/vtbackup/backup_only_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/test/endtoend/backup/vtbackup/backup_only_test.go b/go/test/endtoend/backup/vtbackup/backup_only_test.go index e6ba2c00c96..39deef1b494 100644 --- a/go/test/endtoend/backup/vtbackup/backup_only_test.go +++ b/go/test/endtoend/backup/vtbackup/backup_only_test.go @@ -436,7 +436,7 @@ func verifyDisableEnableRedoLogs(ctx context.Context, t *testing.T, mysqlSocket // MY-013600 // https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.html#error_er_ib_wrn_redo_disabled - qr, err = conn.ExecuteFetch("SELECT 1 FROM performance_schema.error_log WHERE error_code = 'MY-013600'", 1, false) + qr, err = conn.ExecuteFetch("SELECT 1 FROM performance_schema.error_log WHERE data like '%InnoDB redo logging is disabled%'", 1, false) require.NoError(t, err) if len(qr.Rows) != 1 { // Keep trying, possible we haven't disabled yet. @@ -445,7 +445,7 @@ func verifyDisableEnableRedoLogs(ctx context.Context, t *testing.T, mysqlSocket // MY-013601 // https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.html#error_er_ib_wrn_redo_enabled - qr, err = conn.ExecuteFetch("SELECT 1 FROM performance_schema.error_log WHERE error_code = 'MY-013601'", 1, false) + qr, err = conn.ExecuteFetch("SELECT 1 FROM performance_schema.error_log WHERE data like '%InnoDB redo logging is enabled%'", 1, false) require.NoError(t, err) if len(qr.Rows) != 1 { // Keep trying, possible we haven't disabled yet. From a693d07208e1005ca58e95cc8f7b97ba178c3b72 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Sat, 24 Jan 2026 21:56:02 +0000 Subject: [PATCH 2/2] Try adjusted Percona Server distro name Signed-off-by: Matt Lord --- .github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml | 2 +- .github/workflows/cluster_endtoend_xb_backup.yml | 2 +- .github/workflows/cluster_endtoend_xb_recovery.yml | 2 +- test/templates/cluster_endtoend_test.tpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml b/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml index bea73382a26..53c2655568b 100644 --- a/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml +++ b/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml @@ -85,7 +85,7 @@ jobs: sudo apt-get -qq install -y lsb-release gnupg2 wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb sudo DEBIAN_FRONTEND="noninteractive" dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb - sudo percona-release setup ps80 + sudo percona-release setup pdps8.0 sudo apt-get -qq update sudo apt-get -qq install -y percona-server-server percona-server-client diff --git a/.github/workflows/cluster_endtoend_xb_backup.yml b/.github/workflows/cluster_endtoend_xb_backup.yml index 22de31fcad1..bd62836a14b 100644 --- a/.github/workflows/cluster_endtoend_xb_backup.yml +++ b/.github/workflows/cluster_endtoend_xb_backup.yml @@ -85,7 +85,7 @@ jobs: sudo apt-get -qq install -y lsb-release gnupg2 wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb sudo DEBIAN_FRONTEND="noninteractive" dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb - sudo percona-release setup ps80 + sudo percona-release setup pdps8.0 sudo apt-get -qq update sudo apt-get -qq install -y percona-server-server percona-server-client diff --git a/.github/workflows/cluster_endtoend_xb_recovery.yml b/.github/workflows/cluster_endtoend_xb_recovery.yml index ee2627f0b09..f9039793633 100644 --- a/.github/workflows/cluster_endtoend_xb_recovery.yml +++ b/.github/workflows/cluster_endtoend_xb_recovery.yml @@ -85,7 +85,7 @@ jobs: sudo apt-get -qq install -y lsb-release gnupg2 wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb sudo DEBIAN_FRONTEND="noninteractive" dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb - sudo percona-release setup ps80 + sudo percona-release setup pdps8.0 sudo apt-get -qq update sudo apt-get -qq install -y percona-server-server percona-server-client diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl index 890d85366e4..e0b2af3f123 100644 --- a/test/templates/cluster_endtoend_test.tpl +++ b/test/templates/cluster_endtoend_test.tpl @@ -115,7 +115,7 @@ jobs: sudo apt-get -qq install -y lsb-release gnupg2 wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb sudo DEBIAN_FRONTEND="noninteractive" dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb - sudo percona-release setup ps80 + sudo percona-release setup pdps8.0 sudo apt-get -qq update sudo apt-get -qq install -y percona-server-server percona-server-client