kvserver: disable old closed timestamps mechanism

When the new one is enabled, the old one will now be disabled. No point
in running with both of them.

Release note: None
Release justification: Needed for GLOBAL tables.

pkg/kv/kvserver/closedts/closedts.go

@@ -46,6 +46,14 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 )
 
+// IssueTrackingRemovalOfOldClosedTimestampsCode is the Github issue tracking
+// the deletion of the "old" closed timestamps code (i.e. everything around
+// here) in 21.2, now that 21.1 has a new Raft-based closed-timestamps
+// mechanism. The old mechanism is disabled when the cluster version is
+// sufficiently high, and all the tests failing because of it are skipped with
+// this issue.
+const IssueTrackingRemovalOfOldClosedTimestampsCode = 61299
+
 // ReleaseFunc is a closure returned from Track which is used to record the
 // LeaseAppliedIndex (LAI) given to a tracked proposal. The supplied epoch must
 // match that of the lease under which the proposal was proposed.

pkg/kv/kvserver/closedts/container/container_test.go

@@ -25,6 +25,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/stop"
@@ -129,6 +130,7 @@ func setupTwoNodeTest() (_ *TestContainer, _ *TestContainer, shutdown func()) {
 
 func TestTwoNodes(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, closedts.IssueTrackingRemovalOfOldClosedTimestampsCode)
 
 	ctx := context.Background()
 

pkg/kv/kvserver/closedts/provider/provider.go

@@ -16,6 +16,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/ctpb"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
@@ -129,6 +130,12 @@ func (p *Provider) runCloser(ctx context.Context) {
 	var t timeutil.Timer
 	defer t.Stop()
 	for {
+		// If the "new" closed timestamps mechanism is enabled, we inhibit this old one.
+		if p.cfg.Settings.Version.IsActive(ctx, clusterversion.ClosedTimestampsRaftTransport) {
+			log.Infof(ctx, "disabling legacy closed-timestamp mechanism; the new one is enabled")
+			break
+		}
+
 		closeFraction := closedts.CloseFraction.Get(&p.cfg.Settings.SV)
 		targetDuration := float64(closedts.TargetDuration.Get(&p.cfg.Settings.SV))
 		if targetDuration > 0 {

pkg/kv/kvserver/closedts/provider/provider_test.go

@@ -25,6 +25,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -37,6 +38,7 @@ import (
 
 func TestProviderSubscribeNotify(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, closedts.IssueTrackingRemovalOfOldClosedTimestampsCode)
 
 	ctx := context.Background()
 	stopper := stop.NewStopper()
@@ -293,6 +295,7 @@ func TestProviderSubscribeConcurrent(t *testing.T) {
 // value re-enables it.
 func TestProviderTargetDurationSetting(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, closedts.IssueTrackingRemovalOfOldClosedTimestampsCode)
 
 	st := cluster.MakeTestingClusterSettings()
 	closedts.TargetDuration.Override(&st.SV, time.Millisecond)

pkg/kv/kvserver/closedts/transport/clients.go

@@ -14,6 +14,7 @@ import (
 	"context"
 	"unsafe"
 
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/ctpb"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
@@ -66,6 +67,11 @@ type client struct {
 // done so, the information should soon thereafter be available to the Sink and
 // from there, further follower read attempts. Does not block.
 func (pr *Clients) Request(nodeID roachpb.NodeID, rangeID roachpb.RangeID) {
+	// If the new closed timestamps is enabled, this old one is disabled.
+	if pr.cfg.Settings.Version.IsActive(context.TODO(), clusterversion.ClosedTimestampsRaftTransport) {
+		return
+	}
+
 	if nodeID == pr.cfg.NodeID {
 		return
 	}

pkg/kv/kvserver/closedts/transport/transport_test.go

@@ -16,12 +16,14 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/ctpb"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/transport"
 	transporttestutils "github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/transport/testutils"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/stop"
@@ -76,6 +78,7 @@ func assertNumSubscribers(t *testing.T, p *TestProducer, exp int) {
 
 func TestTransportConnectOnRequest(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, closedts.IssueTrackingRemovalOfOldClosedTimestampsCode)
 
 	container := NewTestContainer()
 	defer container.Stopper.Stop(context.Background())
@@ -108,6 +111,7 @@ func TestTransportConnectOnRequest(t *testing.T) {
 
 func TestTransportClientReceivesEntries(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, closedts.IssueTrackingRemovalOfOldClosedTimestampsCode)
 
 	container := NewTestContainer()
 	defer container.Stopper.Stop(context.Background())