From f94f1c76b79be58e15c85750612f95ec9d4c4c5c Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Fri, 16 Dec 2022 18:30:40 -0500 Subject: [PATCH] backupccl: deflake TestClusterRestoreFailCleanup This test occasionally flakes due to #86806. To prevent the flakiness, this patch manually sets the kv.bulkio.write_metadata_sst.enabled cluster setting to false. When #86806 gets addressed, this patch should be reverted. Epic: None Release note: None --- pkg/ccl/backupccl/full_cluster_backup_restore_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/ccl/backupccl/full_cluster_backup_restore_test.go b/pkg/ccl/backupccl/full_cluster_backup_restore_test.go index ba160780b509..c6b0c68f3679 100644 --- a/pkg/ccl/backupccl/full_cluster_backup_restore_test.go +++ b/pkg/ccl/backupccl/full_cluster_backup_restore_test.go @@ -609,6 +609,12 @@ func TestClusterRestoreFailCleanup(t *testing.T) { _, sqlDB, tempDir, cleanupFn := backupRestoreTestSetup(t, singleNode, numAccounts, InitManualReplication) defer cleanupFn() + // This test flakes due to + // https://github.com/cockroachdb/cockroach/issues/86806. Instead of skipping + // the test all together, setting the cluster setting to false which triggers + // the failure. + sqlDB.Exec(t, "SET CLUSTER SETTING kv.bulkio.write_metadata_sst.enabled=false") + // Setup the system systemTablesToVerify to ensure that they are copied to the new cluster. // Populate system.users. for i := 0; i < 1000; i++ {