roachtest: adjust failover tests to changed liveness rangeID

As of #155554, the liveness range has rangeID three, not two.
The tests are updated to avoid relying on the particular ID.

Instead, we check on the pretty-printed start key of the
liveness range, /System/NodeLiveness.

Closes #156450.
Closes #156449.
Closes #156448.

Epic: none

Author: tbg

pkg/cmd/roachtest/tests/failover.go

@@ -56,6 +56,13 @@ var failoverAggregateFunction = func(test string, histogram *roachtestutil.Histo
 	}, nil
 }
 
+// NB: the liveness range's ID has changed in the past. It used to be 2, now
+// it's 3 (#155554). Using the start key avoids relying on a specific rangeID.
+const (
+	predAllButLiveness = `start_key != '/System/NodeLiveness'`
+	predOnlyLiveness   = `start_key = '/System/NodeLiveness'`
+)
+
 // registerFailover registers a set of failover benchmarks. These tests
 // benchmark the maximum unavailability experienced by clients during various
 // node failures, and exports them for roachperf graphing. They do not make any
@@ -752,7 +759,7 @@ func runFailoverPartialLeaseLiveness(ctx context.Context, t test.Test, c cluster
 	// all nodes regardless.
 	relocateRanges(t, ctx, conn, `database_name = 'kv'`, []int{1, 2, 3, 4}, []int{5, 6, 7})
 	relocateRanges(t, ctx, conn, `database_name != 'kv'`, []int{5, 6, 7}, []int{1, 2, 3, 4})
-	relocateRanges(t, ctx, conn, `range_id != 2`, []int{4}, []int{1, 2, 3})
+	relocateRanges(t, ctx, conn, predAllButLiveness, []int{4}, []int{1, 2, 3})
 
 	// Run workload on n8 using n1-n3 as gateways (not partitioned) until test
 	// ends (context cancels).
@@ -781,8 +788,8 @@ func runFailoverPartialLeaseLiveness(ctx context.Context, t test.Test, c cluster
 				// them to where they should be.
 				relocateRanges(t, ctx, conn, `database_name = 'kv'`, []int{1, 2, 3, 4}, []int{5, 6, 7})
 				relocateRanges(t, ctx, conn, `database_name != 'kv'`, []int{node}, []int{1, 2, 3})
-				relocateRanges(t, ctx, conn, `range_id = 2`, []int{5, 6, 7}, []int{1, 2, 3, 4})
-				relocateLeases(t, ctx, conn, `range_id = 2`, 4)
+				relocateRanges(t, ctx, conn, predOnlyLiveness, []int{5, 6, 7}, []int{1, 2, 3, 4})
+				relocateLeases(t, ctx, conn, predOnlyLiveness, 4)
 
 				// Randomly sleep up to the lease renewal interval, to vary the time
 				// between the last lease renewal and the failure.
@@ -976,10 +983,10 @@ func runFailoverLiveness(
 	// do it ourselves. Precreating the database/range and moving it to the
 	// correct nodes first is not sufficient, since workload will spread the
 	// ranges across all nodes regardless.
-	relocateRanges(t, ctx, conn, `range_id != 2`, []int{4}, []int{1, 2, 3})
+	relocateRanges(t, ctx, conn, predAllButLiveness, []int{4}, []int{1, 2, 3})
 
-	// We also make sure the lease is located on n4.
-	relocateLeases(t, ctx, conn, `range_id = 2`, 4)
+	// We also make sure the liveness lease is located on n4.
+	relocateLeases(t, ctx, conn, predOnlyLiveness, 4)
 
 	// Run workload on n5 via n1-n3 gateways until test ends (context cancels).
 	t.L().Printf("running workload")
@@ -1002,8 +1009,8 @@ func runFailoverLiveness(
 
 			// Ranges and leases may occasionally escape their constraints. Move them
 			// to where they should be.
-			relocateRanges(t, ctx, conn, `range_id != 2`, []int{4}, []int{1, 2, 3})
-			relocateLeases(t, ctx, conn, `range_id = 2`, 4)
+			relocateRanges(t, ctx, conn, predAllButLiveness, []int{4}, []int{1, 2, 3})
+			relocateLeases(t, ctx, conn, predOnlyLiveness, 4)
 
 			// Randomly sleep up to the lease renewal interval, to vary the time
 			// between the last lease renewal and the failure.
@@ -1018,7 +1025,7 @@ func runFailoverLiveness(
 
 			t.L().Printf("recovering n%d (%s)", 4, failer)
 			failer.Recover(ctx, 4)
-			relocateLeases(t, ctx, conn, `range_id = 2`, 4)
+			relocateLeases(t, ctx, conn, predOnlyLiveness, 4)
 		}
 
 		sleepFor(ctx, t, time.Minute) // let cluster recover
@@ -1089,9 +1096,9 @@ func runFailoverSystemNonLiveness(
 	// n1-n3, so we do it ourselves. Precreating the database/range and moving it
 	// to the correct nodes first is not sufficient, since workload will spread
 	// the ranges across all nodes regardless.
-	relocateRanges(t, ctx, conn, `database_name = 'kv' OR range_id = 2`,
+	relocateRanges(t, ctx, conn, `database_name = 'kv' OR `+predOnlyLiveness,
 		[]int{4, 5, 6}, []int{1, 2, 3})
-	relocateRanges(t, ctx, conn, `database_name != 'kv' AND range_id != 2`,
+	relocateRanges(t, ctx, conn, `database_name != 'kv' AND `+predAllButLiveness,
 		[]int{1, 2, 3}, []int{4, 5, 6})
 
 	// Run workload on n7 via n1-n3 as gateways until test ends (context cancels).
@@ -1116,9 +1123,9 @@ func runFailoverSystemNonLiveness(
 
 				// Ranges may occasionally escape their constraints. Move them
 				// to where they should be.
-				relocateRanges(t, ctx, conn, `database_name != 'kv' AND range_id != 2`,
+				relocateRanges(t, ctx, conn, `database_name != 'kv' AND `+predAllButLiveness,
 					[]int{1, 2, 3}, []int{4, 5, 6})
-				relocateRanges(t, ctx, conn, `database_name = 'kv' OR range_id = 2`,
+				relocateRanges(t, ctx, conn, `database_name = 'kv' OR `+predOnlyLiveness,
 					[]int{4, 5, 6}, []int{1, 2, 3})
 
 				// Randomly sleep up to the lease renewal interval, to vary the time