Skip to content

Commit 77832f1

Browse files
committed
kvserver: deflake TestPromoteNonVoterInAddVoter
Epic: none Release note: none
1 parent 20b8356 commit 77832f1

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

pkg/kv/kvserver/replicate_queue_test.go

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2279,12 +2279,19 @@ SELECT * FROM (
22792279
return 0, 0, roachpb.RangeDescriptor{}, err
22802280
}
22812281

2282+
// Find the start key of the range containing our table. Note that TABLE t
2283+
// might not show up in SHOW RANGES immediately. Return zeroes in this case,
2284+
// and the caller retries.
2285+
const q = `
2286+
SELECT start_key FROM crdb_internal.ranges_no_leases
2287+
WHERE range_id IN (SELECT range_id FROM [SHOW RANGES FROM TABLE t] LIMIT 1);`
22822288
var key roachpb.Key
2283-
require.NoError(t,
2284-
db.QueryRow(`
2285-
SELECT start_key from crdb_internal.ranges_no_leases WHERE range_id IN
2286-
(SELECT range_id FROM [SHOW RANGES FROM TABLE t] LIMIT 1);
2287-
`).Scan(&key))
2289+
if err := db.QueryRow(q).Scan(&key); errors.Is(err, gosql.ErrNoRows) {
2290+
return 0, 0, roachpb.RangeDescriptor{}, nil
2291+
} else {
2292+
require.NoError(t, err)
2293+
}
2294+
22882295
desc, err := tc.LookupRange(key)
22892296
if err != nil {
22902297
return 0, 0, roachpb.RangeDescriptor{}, err

0 commit comments

Comments
 (0)