Merge pull request #138684 from cockroachdb/blathers/backport-release…

…-24.1-138088 release-24.1: ccl/multiregionccl: deflake TestRegionLivenessProberForLeases
cockroachdb · Jan 13, 2025 · 8747c40 · 8747c40
2 parents a874293 + bf4eb4b
commit 8747c40
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/ccl/multiregionccl/regionliveness_test.go b/pkg/ccl/multiregionccl/regionliveness_test.go
@@ -281,7 +281,9 @@ func TestRegionLivenessProberForLeases(t *testing.T) {
 				keyToBlockMu.Lock()
 				keyPrefix := keyToBlock
 				keyToBlockMu.Unlock()
-				if keyPrefix == nil || !deleteRequest.Key[:len(keyPrefix)].Equal(keyPrefix) {
+				isPrefixToDelReq := len(deleteRequest.Key) >= len(keyPrefix) &&
+					!deleteRequest.Key[:len(keyPrefix)].Equal(keyPrefix)
+				if keyPrefix == nil || isPrefixToDelReq {
 					return nil
 				}
 				recoveryStart <- struct{}{}