From f74435a8b57e2b3d2726cee6b07d5f24584fe23b Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Wed, 24 Aug 2022 15:11:15 -0400 Subject: [PATCH] backupccl: set kv.bulkio.write_metadata_sst.enabled to default false This patch sets write_metadata_sst cluster setting to false in prep for the 22.2 branch cut, as there's additional work required before this feature gets used in production. Unit tests may continue to write the MetadataSST because of a new MetamorphicTestBool. Setting this to false will also stop the roachtest in #86289 from consistently failing due to #86806. Fixes #86289 Release note: none Release justification: prevents using an experimental feature by default --- pkg/ccl/backupccl/backupinfo/BUILD.bazel | 1 + pkg/ccl/backupccl/backupinfo/manifest_handling.go | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/ccl/backupccl/backupinfo/BUILD.bazel b/pkg/ccl/backupccl/backupinfo/BUILD.bazel index a7ca79d41cfc..5d359950deec 100644 --- a/pkg/ccl/backupccl/backupinfo/BUILD.bazel +++ b/pkg/ccl/backupccl/backupinfo/BUILD.bazel @@ -33,6 +33,7 @@ go_library( "//pkg/sql/sem/tree", "//pkg/sql/stats", "//pkg/storage", + "//pkg/util", "//pkg/util/ctxgroup", "//pkg/util/encoding", "//pkg/util/hlc", diff --git a/pkg/ccl/backupccl/backupinfo/manifest_handling.go b/pkg/ccl/backupccl/backupinfo/manifest_handling.go index e45022ed3c60..000578e202b6 100644 --- a/pkg/ccl/backupccl/backupinfo/manifest_handling.go +++ b/pkg/ccl/backupccl/backupinfo/manifest_handling.go @@ -39,6 +39,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/stats" + "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/ctxgroup" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/hlc" @@ -82,13 +83,11 @@ const ( // WriteMetadataSST controls if we write the experimental new format BACKUP // metadata file. -// kv.bulkio.rite_metadata_sst.enabled set to false by default due to -// https://github.com/cockroachdb/cockroach/issues/85564. var WriteMetadataSST = settings.RegisterBoolSetting( settings.TenantWritable, "kv.bulkio.write_metadata_sst.enabled", "write experimental new format BACKUP metadata file", - true, + util.ConstantWithMetamorphicTestBool("write-metadata-sst", false), ) // IsGZipped detects whether the given bytes represent GZipped data. This check