Merge #150920 #150921 #150950

150920: mmaprototype: remove unused loadTracker r=tbg a=tbg

Epic: CRDB-25222

150921: mmaprototype: remove unused lint suppression r=tbg a=tbg

I think these are all used now, and if they're not, I'd like to know.

Epic: CRDB-25222

150950: backup: deflake some chaining tests r=jeffswenson a=msbutler

Following approach from #150864.

Informs #150839

Release note: none

Co-authored-by: Tobias Grieger <[email protected]>
Co-authored-by: Michael Butler <[email protected]>

Author: 3 people

pkg/backup/create_scheduled_backup_test.go

@@ -121,8 +121,14 @@ func (h *testHelper) setOverrideAsOfClauseKnob(t *testing.T) {
 	// We'll be manipulating schedule time via th.env, but we can't fool actual
 	// backup when it comes to AsOf time.  So, override AsOf backup clause to be
 	// the current time.
-	h.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, _ time.Time) {
-		expr, err := tree.MakeDTimestampTZ(h.cfg.DB.KV().Clock().PhysicalTime(), time.Microsecond)
+	h.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, statementTime time.Time) {
+		backupAsOfTime := h.cfg.DB.KV().Clock().PhysicalTime()
+		if backupAsOfTime.After(statementTime) {
+			// If the backupAsOfTime is after the statement time, then we use the
+			// statement time to avoid "AOST in the future" errors.
+			backupAsOfTime = statementTime
+		}
+		expr, err := tree.MakeDTimestampTZ(backupAsOfTime, time.Microsecond)
 		require.NoError(t, err)
 		clause.Expr = expr
 	}

pkg/backup/schedule_pts_chaining_test.go

@@ -114,8 +114,13 @@ INSERT INTO t values (1), (10), (100);
 `)
 
 	backupAsOfTimes := make([]time.Time, 0)
-	th.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, _ time.Time) {
+	th.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, statementTime time.Time) {
 		backupAsOfTime := th.cfg.DB.KV().Clock().PhysicalTime()
+		if backupAsOfTime.After(statementTime) {
+			// If the backupAsOfTime is after the statement time, then we use the
+			// statement time to avoid "AOST in the future" errors.
+			backupAsOfTime = statementTime
+		}
 		expr, err := tree.MakeDTimestampTZ(backupAsOfTime, time.Microsecond)
 		require.NoError(t, err)
 		clause.Expr = expr
@@ -241,8 +246,13 @@ INSERT INTO t values (1), (10), (100);
 `)
 
 	backupAsOfTimes := make([]time.Time, 0)
-	th.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, _ time.Time) {
+	th.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, statementTime time.Time) {
 		backupAsOfTime := th.cfg.DB.KV().Clock().PhysicalTime()
+		if backupAsOfTime.After(statementTime) {
+			// If the backupAsOfTime is after the statement time, then we use the
+			// statement time to avoid "AOST in the future" errors.
+			backupAsOfTime = statementTime
+		}
 		expr, err := tree.MakeDTimestampTZ(backupAsOfTime, time.Microsecond)
 		require.NoError(t, err)
 		clause.Expr = expr
@@ -336,8 +346,13 @@ INSERT INTO t values (1), (10), (100);
 `)
 
 	backupAsOfTimes := make([]time.Time, 0)
-	th.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, _ time.Time) {
+	th.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, statementTime time.Time) {
 		backupAsOfTime := th.cfg.DB.KV().Clock().PhysicalTime()
+		if backupAsOfTime.After(statementTime) {
+			// If the backupAsOfTime is after the statement time, then we use the
+			// statement time to avoid "AOST in the future" errors.
+			backupAsOfTime = statementTime
+		}
 		expr, err := tree.MakeDTimestampTZ(backupAsOfTime, time.Microsecond)
 		require.NoError(t, err)
 		clause.Expr = expr

pkg/kv/kvserver/allocator/mmaprototype/BUILD.bazel

@@ -10,7 +10,6 @@ go_library(
         "constraint_matcher.go",
         "doc.go",
         "load.go",
-        "load_tracker.go",
         "memo_helper.go",
         "messages.go",
         "top_k_replicas.go",

pkg/kv/kvserver/allocator/mmaprototype/load_tracker.go

@@ -60,21 +60,3 @@ type RangeMsg struct {
 	Conf      roachpb.SpanConfig
 	RangeLoad RangeLoad
 }
-
-func (rm *RangeMsg) isDeletedRange() bool {
-	return len(rm.Replicas) == 0
-}
-
-// Avoid unused lint errors.
-
-var _ = (&RangeMsg{}).isDeletedRange
-var _ = StoreLoadMsg{}.StoreID
-var _ = StoreLoadMsg{}.Load
-var _ = StoreLoadMsg{}.Capacity
-var _ = StoreLoadMsg{}.SecondaryLoad
-var _ = StoreLeaseholderMsg{}.StoreID
-var _ = StoreLeaseholderMsg{}.Ranges
-var _ = RangeMsg{}.RangeID
-var _ = RangeMsg{}.Replicas
-var _ = RangeMsg{}.Conf
-var _ = RangeMsg{}.RangeLoad