Skip to content

Commit 068573d

Browse files
committed
backup: remove metamorphic backup manifest read
Epic: none Release note: none
1 parent 76b08e5 commit 068573d

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

pkg/backup/backup_job.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ import (
6161
"github.com/cockroachdb/cockroach/pkg/util/log"
6262
"github.com/cockroachdb/cockroach/pkg/util/log/eventpb"
6363
"github.com/cockroachdb/cockroach/pkg/util/log/logutil"
64-
"github.com/cockroachdb/cockroach/pkg/util/metamorphic"
6564
"github.com/cockroachdb/cockroach/pkg/util/mon"
6665
"github.com/cockroachdb/cockroach/pkg/util/randutil"
6766
"github.com/cockroachdb/cockroach/pkg/util/retry"
@@ -82,8 +81,6 @@ var BackupCheckpointInterval = settings.RegisterDurationSetting(
8281
"the minimum time between writing progress checkpoints during a backup",
8382
time.Minute)
8483

85-
var forceReadBackupManifest = metamorphic.ConstantWithTestBool("backup-read-manifest", false)
86-
8784
var useBulkOracle = settings.RegisterBoolSetting(
8885
settings.ApplicationLevel,
8986
"bulkio.backup.balanced_distribution.enabled",
@@ -705,7 +702,7 @@ func (b *backupResumer) Resume(ctx context.Context, execCtx interface{}) error {
705702
defer mem.Close(ctx)
706703
var memSize int64
707704

708-
if backupManifest == nil || forceReadBackupManifest {
705+
if backupManifest == nil {
709706
backupManifest, memSize, err = b.readManifestOnResume(ctx, &mem, p.ExecCfg(), defaultStore,
710707
details, p.User(), &kmsEnv)
711708
if err != nil {

0 commit comments

Comments
 (0)