Skip to content

Commit

Permalink
backupccl: set kv.bulkio.write_metadata_sst.enabled to default false
Browse files Browse the repository at this point in the history
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
  • Loading branch information
msbutler committed Aug 25, 2022
1 parent fe11e4b commit f74435a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions pkg/ccl/backupccl/backupinfo/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions pkg/ccl/backupccl/backupinfo/manifest_handling.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f74435a

Please sign in to comment.