From 40f92f4dd55fb13e77162a7c515fa2cfed3a9020 Mon Sep 17 00:00:00 2001 From: Ella Baron Date: Thu, 7 May 2026 15:43:39 -0700 Subject: [PATCH 1/5] Skip anonymizer-backup tests on non-Linux platforms YB Controller is only built/supported on Linux, so skip the YBBackupWithAnonymizerTest fixture's SetUp on other platforms. This skips both RestoreAfterRoleRenameWithAnonymizer and CloneAfterRoleRenameWithAnonymizer (whose fixture inherits from YBBackupWithAnonymizerTest) on macOS rather than failing. --- src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc b/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc index 2ca72920d60d..679befa068ad 100644 --- a/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc +++ b/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc @@ -933,6 +933,9 @@ TEST_P(YBBackupDuringAlterTable, RenameColumn) { class YBBackupWithAnonymizerTest : public YBBackupDuringDdl { public: void SetUp() override { + #ifndef __linux__ + GTEST_SKIP() << "YB Controller is only built/supported on Linux"; + #endif ANNOTATE_UNPROTECTED_WRITE(FLAGS_enable_pg_anonymizer) = true; ANNOTATE_UNPROTECTED_WRITE(FLAGS_TEST_use_yb_controller) = true; YBBackupDuringDdl::SetUp(); From ef17a839b976ff528ade0dbf24a5e16d86be687c Mon Sep 17 00:00:00 2001 From: Ella Baron Date: Wed, 10 Jun 2026 07:19:40 -0700 Subject: [PATCH 2/5] made the fix compliant with the other tests --- src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc b/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc index 679befa068ad..bcd2a786c8d0 100644 --- a/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc +++ b/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc @@ -933,9 +933,6 @@ TEST_P(YBBackupDuringAlterTable, RenameColumn) { class YBBackupWithAnonymizerTest : public YBBackupDuringDdl { public: void SetUp() override { - #ifndef __linux__ - GTEST_SKIP() << "YB Controller is only built/supported on Linux"; - #endif ANNOTATE_UNPROTECTED_WRITE(FLAGS_enable_pg_anonymizer) = true; ANNOTATE_UNPROTECTED_WRITE(FLAGS_TEST_use_yb_controller) = true; YBBackupDuringDdl::SetUp(); @@ -1013,6 +1010,9 @@ class YBCloneWithAnonymizerTest : public YBBackupWithAnonymizerTest { // Same scenario as RestoreAfterRoleRenameWithAnonymizer but using database clone // instead of manual backup/restore. TEST_F(YBCloneWithAnonymizerTest, CloneAfterRoleRenameWithAnonymizer) { + if (!UseYbController()) { + GTEST_SKIP() << "Test requires YBC"; + } auto conn = ASSERT_RESULT(SetUpAnonymizer()); ASSERT_RESULT(snapshot_util_->CreateSchedule( From a9fbf340325cb88b1da947f9e7fd963379975bdd Mon Sep 17 00:00:00 2001 From: Ella Baron Date: Wed, 10 Jun 2026 07:24:07 -0700 Subject: [PATCH 3/5] made the fix compliant with the other tests --- src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc b/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc index bcd2a786c8d0..6e87352fbfdc 100644 --- a/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc +++ b/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc @@ -933,6 +933,9 @@ TEST_P(YBBackupDuringAlterTable, RenameColumn) { class YBBackupWithAnonymizerTest : public YBBackupDuringDdl { public: void SetUp() override { + if (!UseYbController()) { + GTEST_SKIP() << "Test requires YBC"; + } ANNOTATE_UNPROTECTED_WRITE(FLAGS_enable_pg_anonymizer) = true; ANNOTATE_UNPROTECTED_WRITE(FLAGS_TEST_use_yb_controller) = true; YBBackupDuringDdl::SetUp(); @@ -975,9 +978,6 @@ class YBBackupWithAnonymizerTest : public YBBackupDuringDdl { // encounters "role does not exist" errors for the GRANT statements. The restore itself // should succeed and ignore the errors because --dump-role-checks is used. TEST_F(YBBackupWithAnonymizerTest, RestoreAfterRoleRenameWithAnonymizer) { - if (!UseYbController()) { - GTEST_SKIP() << "Test requires YBC"; - } auto conn = ASSERT_RESULT(SetUpAnonymizer()); const string backup_dir = GetTempDir("backup"); @@ -1010,9 +1010,6 @@ class YBCloneWithAnonymizerTest : public YBBackupWithAnonymizerTest { // Same scenario as RestoreAfterRoleRenameWithAnonymizer but using database clone // instead of manual backup/restore. TEST_F(YBCloneWithAnonymizerTest, CloneAfterRoleRenameWithAnonymizer) { - if (!UseYbController()) { - GTEST_SKIP() << "Test requires YBC"; - } auto conn = ASSERT_RESULT(SetUpAnonymizer()); ASSERT_RESULT(snapshot_util_->CreateSchedule( From 4e544ccd3479518893b5894d624427ec225c3839 Mon Sep 17 00:00:00 2001 From: Ella Baron Date: Wed, 17 Jun 2026 13:22:52 -0700 Subject: [PATCH 4/5] fixed code review comment --- src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc b/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc index 6e87352fbfdc..71afdfbf2e6c 100644 --- a/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc +++ b/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc @@ -937,7 +937,6 @@ class YBBackupWithAnonymizerTest : public YBBackupDuringDdl { GTEST_SKIP() << "Test requires YBC"; } ANNOTATE_UNPROTECTED_WRITE(FLAGS_enable_pg_anonymizer) = true; - ANNOTATE_UNPROTECTED_WRITE(FLAGS_TEST_use_yb_controller) = true; YBBackupDuringDdl::SetUp(); CreateDatabase(kBackupSourceDbName); } From 2d282474074932ce99e64141011f4399eea81b76 Mon Sep 17 00:00:00 2001 From: Ella Baron Date: Wed, 17 Jun 2026 15:01:34 -0700 Subject: [PATCH 5/5] fixed code review comment --- src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc b/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc index 71afdfbf2e6c..327e68beb054 100644 --- a/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc +++ b/src/yb/tools/yb-backup/yb-backup-during-ddl-test.cc @@ -54,7 +54,6 @@ using yb::client::YBTableName; DECLARE_bool(TEST_enable_sync_points); DECLARE_bool(TEST_mark_snapshot_as_failed); DECLARE_bool(TEST_use_custom_varz); -DECLARE_bool(TEST_use_yb_controller); DECLARE_bool(enable_pg_anonymizer); DECLARE_bool(ysql_beta_features);