Merge #58387

58387: kvserver: downgrade a potentially racey assertion r=tbg a=irfansharif Touches #58378; a stop-gap while we investigate. Release note: None Co-authored-by: irfan sharif <[email protected]>
cockroachdb · Jan 4, 2021 · fb71ee4 · fb71ee4
2 parents 7d60e44 + ef64519
commit fb71ee4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/kv/kvserver/replica_proposal.go b/pkg/kv/kvserver/replica_proposal.go
@@ -780,7 +780,10 @@ func (r *Replica) evaluateProposal(
 			activeVersion := r.ClusterSettings().Version.ActiveVersion(ctx).Version
 			migrationVersion := clusterversion.ByKey(clusterversion.TruncatedAndRangeAppliedStateMigration)
 			if migrationVersion.Less(activeVersion) {
-				log.Fatalf(ctx, "not using applied state key in v21.1")
+				// TODO(irfansharif): This was originally a fatal, which seems
+				// to have been a racey assertion (see #58378). We've downgraded
+				// it to an error to not trip up builds while we investigate.
+				log.Error(ctx, "not using applied state key in v21.1")
 			}
 			// The range applied state was introduced in v2.1. It's possible to
 			// still find ranges that haven't activated it. If so, activate it.