Skip to content

Commit c934fd7

Browse files
committed
kvserver: correctly query new leaseholder in TestFlowControlSendQueueRangeRelocate
Epic: none Release note: None
1 parent 90db6ea commit c934fd7

5 files changed

+21
-1
lines changed

pkg/kv/kvserver/flow_control_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2534,7 +2534,7 @@ func TestFlowControlSendQueueRangeRelocate(t *testing.T) {
25342534
// Avoid double printing if the lease hasn't moved.
25352535
h.comment(fmt.Sprintf(`
25362536
-- Observe the total tracked tokens per-stream on new leaseholder n%v.`, newLeaseNode))
2537-
h.query(n1, v2FlowPerStreamTrackedQueryStr, flowPerStreamTrackedQueryHeaderStrs...)
2537+
h.query(newLeaseDB, v2FlowPerStreamTrackedQueryStr, flowPerStreamTrackedQueryHeaderStrs...)
25382538
}
25392539

25402540
// Allow admission to proceed on n3 and wait for all tokens to be returned.

pkg/kv/kvserver/testdata/flow_control_integration_v2/send_queue_range_relocate_from_has_token_store_transfer_lease

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ ORDER BY
108108

109109
range_id | store_id | total_tracked_tokens
110110
-----------+----------+-----------------------
111+
a | 1 | 0 B
112+
a | 2 | 0 B
113+
a | 3 | 1.0 MiB
114+
a | 4 | 0 B
115+
a | 6 | 0 B
111116

112117

113118
-- (Allowing below-raft admission to proceed on n3.)

pkg/kv/kvserver/testdata/flow_control_integration_v2/send_queue_range_relocate_from_leader_store

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ ORDER BY
108108

109109
range_id | store_id | total_tracked_tokens
110110
-----------+----------+-----------------------
111+
a | 2 | 0 B
112+
a | 3 | 1.0 MiB
113+
a | 4 | 0 B
114+
a | 5 | 0 B
115+
a | 6 | 0 B
111116

112117

113118
-- (Allowing below-raft admission to proceed on n3.)

pkg/kv/kvserver/testdata/flow_control_integration_v2/send_queue_range_relocate_from_leader_store_transfer_lease

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ ORDER BY
108108

109109
range_id | store_id | total_tracked_tokens
110110
-----------+----------+-----------------------
111+
a | 2 | 0 B
112+
a | 3 | 1.0 MiB
113+
a | 4 | 0 B
114+
a | 5 | 0 B
115+
a | 6 | 0 B
111116

112117

113118
-- (Allowing below-raft admission to proceed on n3.)

pkg/kv/kvserver/testdata/flow_control_integration_v2/send_queue_range_relocate_from_send_queue_store_transfer_lease

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ ORDER BY
108108

109109
range_id | store_id | total_tracked_tokens
110110
-----------+----------+-----------------------
111+
a | 1 | 0 B
112+
a | 2 | 0 B
113+
a | 4 | 0 B
114+
a | 5 | 0 B
115+
a | 6 | 0 B
111116

112117

113118
-- (Allowing below-raft admission to proceed on n3.)

0 commit comments

Comments
 (0)