diff --git a/pkg/cmd/roachtest/acceptance.go b/pkg/cmd/roachtest/acceptance.go index 676b8fc84170..265d76d64a6b 100644 --- a/pkg/cmd/roachtest/acceptance.go +++ b/pkg/cmd/roachtest/acceptance.go @@ -64,7 +64,6 @@ func registerAcceptance(r *testRegistry) { // to head after 19.2 fails. minVersion: "v19.2.0", timeout: 30 * time.Minute, - skip: "https://github.com/cockroachdb/cockroach/issues/52907", }, } tags := []string{"default", "quick"} diff --git a/pkg/kv/kvserver/batcheval/cmd_end_transaction.go b/pkg/kv/kvserver/batcheval/cmd_end_transaction.go index b7a54fb92546..53bb1b3fde2d 100644 --- a/pkg/kv/kvserver/batcheval/cmd_end_transaction.go +++ b/pkg/kv/kvserver/batcheval/cmd_end_transaction.go @@ -904,6 +904,15 @@ func splitTriggerHelper( return enginepb.MVCCStats{}, result.Result{}, err } + if !rec.ClusterSettings().Version.IsActive(ctx, clusterversion.VersionAbortSpanBytes) { + // Since the stats here is used to seed the initial state for the RHS + // replicas, we need to be careful about zero-ing out the abort span + // bytes if the cluster version introducing it is not yet active. Not + // doing so can result in inconsistencies in MVCCStats across replicas + // in a mixed-version cluster. + h.AbsPostSplitRight().AbortSpanBytes = 0 + } + // Note: we don't copy the queue last processed times. This means // we'll process the RHS range in consistency and time series // maintenance queues again possibly sooner than if we copied. The @@ -1033,14 +1042,6 @@ func splitTriggerHelper( if !rec.ClusterSettings().Version.IsActive(ctx, clusterversion.VersionContainsEstimatesCounter) { deltaPostSplitLeft.ContainsEstimates = 0 } - if !rec.ClusterSettings().Version.IsActive(ctx, clusterversion.VersionAbortSpanBytes) { - // Since the stats here is used to seed the initial state for the RHS - // replicas, we need to be careful about zero-ing out the abort span - // bytes if the cluster version introducing it is not yet active. Not - // doing so can result in inconsistencies in MVCCStats across replicas - // in a mixed-version cluster. - pd.Replicated.Split.RHSDelta.AbortSpanBytes = 0 - } return deltaPostSplitLeft, pd, nil }