cluster: remove VersionSnapshotsWithoutLog

Release note: None
cockroachdb · Jun 26, 2019 · 7400cc4 · 7400cc4
1 parent caebf7e
commit 7400cc4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/pkg/settings/cluster/cockroach_versions.go b/pkg/settings/cluster/cockroach_versions.go
@@ -34,7 +34,6 @@ const (
 	Version2_1
 	VersionUnreplicatedRaftTruncatedState // see versionsSingleton for details
 	VersionSideloadedStorageNoReplicaID   // see versionsSingleton for details
-	VersionSnapshotsWithoutLog
 	Version19_1
 	VersionStart19_2
 	VersionQueryTxnTimestamp
@@ -447,11 +446,12 @@ var versionsSingleton = keyedVersions([]keyedVersion{
 	// 	Key:     VersionPushTxnToInclusive,
 	// 	Version: roachpb.Version{Major: 2, Minor: 1, Unstable: 10},
 	// },
-	{
-		// VersionSnapshotsWithoutLog is https://github.com/cockroachdb/cockroach/pull/36714.
-		Key:     VersionSnapshotsWithoutLog,
-		Version: roachpb.Version{Major: 2, Minor: 1, Unstable: 11},
-	},
+	// Removed.
+	// {
+	// 	// VersionSnapshotsWithoutLog is https://github.com/cockroachdb/cockroach/pull/36714.
+	// 	Key:     VersionSnapshotsWithoutLog,
+	// 	Version: roachpb.Version{Major: 2, Minor: 1, Unstable: 11},
+	// },
 	{
 		// Version19_1 is CockroachDB v19.1. It's used for all v19.1.x patch releases.
 		Key:     Version19_1,

diff --git a/pkg/settings/cluster/versionkey_string.go b/pkg/settings/cluster/versionkey_string.go
diff --git a/pkg/storage/replica_command.go b/pkg/storage/replica_command.go
@@ -23,7 +23,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/rpc/nodedialer"
-	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/storage/engine"
 	"github.com/cockroachdb/cockroach/pkg/storage/storagebase"
 	"github.com/cockroachdb/cockroach/pkg/storage/storagepb"
@@ -1130,8 +1129,7 @@ func (r *Replica) sendSnapshot(
 	}
 
 	canAvoidSendingLog := !usesReplicatedTruncatedState &&
-		snap.State.TruncatedState.Index < snap.State.RaftAppliedIndex &&
-		r.store.ClusterSettings().Version.IsActive(cluster.VersionSnapshotsWithoutLog)
+		snap.State.TruncatedState.Index < snap.State.RaftAppliedIndex
 
 	if canAvoidSendingLog {
 		// If we're not using a legacy (replicated) truncated state, we avoid