Merge #153263 #153511

153263: kvserver: correctly query new leaseholder in TestFlowControlSendQueueRangeRelocate r=sumeerbhola a=stevendanna



153511: kvpb: minor comment update r=yuzefovich a=stevendanna

Epic: none
Release note: None

Co-authored-by: Steven Danna <[email protected]>

Author: craig[bot]

pkg/kv/kvpb/api.proto

@@ -2803,8 +2803,10 @@ message Header {
   // - QueryLocksRequest
   // - IsSpanEmptyRequest
   //
-  // The following requests types are also allowed in the batch, although the
-  // limit has no effect on them:
+  // The following request types are also allowed in the batch. These requests
+  // do not consume any keys from the limit; however, they may fail to be
+  // processed if the batch previously consumed the entire limit.
+  //
   // - ExportRequest
   // - QueryIntentRequest
   // - EndTxnRequest

pkg/kv/kvserver/flow_control_integration_test.go

@@ -2534,7 +2534,7 @@ func TestFlowControlSendQueueRangeRelocate(t *testing.T) {
 				// Avoid double printing if the lease hasn't moved.
 				h.comment(fmt.Sprintf(`
 -- Observe the total tracked tokens per-stream on new leaseholder n%v.`, newLeaseNode))
-				h.query(n1, v2FlowPerStreamTrackedQueryStr, flowPerStreamTrackedQueryHeaderStrs...)
+				h.query(newLeaseDB, v2FlowPerStreamTrackedQueryStr, flowPerStreamTrackedQueryHeaderStrs...)
 			}
 
 			// 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

@@ -108,6 +108,11 @@ ORDER BY
 
   range_id | store_id | total_tracked_tokens  
 -----------+----------+-----------------------
+  a        | 1        | 0 B                   
+  a        | 2        | 0 B                   
+  a        | 3        | 1.0 MiB               
+  a        | 4        | 0 B                   
+  a        | 6        | 0 B                   
 
 
 -- (Allowing below-raft admission to proceed on n3.)

pkg/kv/kvserver/testdata/flow_control_integration_v2/send_queue_range_relocate_from_leader_store

@@ -108,6 +108,11 @@ ORDER BY
 
   range_id | store_id | total_tracked_tokens  
 -----------+----------+-----------------------
+  a        | 2        | 0 B                   
+  a        | 3        | 1.0 MiB               
+  a        | 4        | 0 B                   
+  a        | 5        | 0 B                   
+  a        | 6        | 0 B                   
 
 
 -- (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

@@ -108,6 +108,11 @@ ORDER BY
 
   range_id | store_id | total_tracked_tokens  
 -----------+----------+-----------------------
+  a        | 2        | 0 B                   
+  a        | 3        | 1.0 MiB               
+  a        | 4        | 0 B                   
+  a        | 5        | 0 B                   
+  a        | 6        | 0 B                   
 
 
 -- (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

@@ -108,6 +108,11 @@ ORDER BY
 
   range_id | store_id | total_tracked_tokens  
 -----------+----------+-----------------------
+  a        | 1        | 0 B                   
+  a        | 2        | 0 B                   
+  a        | 4        | 0 B                   
+  a        | 5        | 0 B                   
+  a        | 6        | 0 B                   
 
 
 -- (Allowing below-raft admission to proceed on n3.)