Merge #155007

155007: kvserver: remove whitespace in flow_control_integration_test.go r=pav-kv a=stevendanna

This makes it easier to edit this test file if your editor removes trailing whitespace by default.

Epic: none
Release note: None

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

Author: craig[bot]

pkg/kv/kvserver/flow_control_integration_test.go

@@ -1570,7 +1570,7 @@ func TestFlowControlLeaderNotLeaseholderV2(t *testing.T) {
 		h.query(n1, v2FlowTokensQueryStr)
 
 		h.comment(`
--- (Issuing another 1x1MiB, 3x replicated write that's admitted via 
+-- (Issuing another 1x1MiB, 3x replicated write that's admitted via
 -- the work queue on the leaseholder. It shouldn't deduct any tokens.)
 `)
 		h.put(ctx, k, 1, testFlowModeToPri(mode))
@@ -1858,7 +1858,7 @@ func TestFlowControlSendQueue(t *testing.T) {
 --   Block admission [n2,n3,n4,n5].
 --   Regular write -4 MiB.
 --   Regular write -1  MiB.
---   - Blocks on wait-for-eval, however the test bypasses this instance.    
+--   - Blocks on wait-for-eval, however the test bypasses this instance.
 --   - Metrics should reflect 2 streams being prevented from forming a send queue.
 --   Allow admission [n1,n2,n3,n4,n5] (all).
 --   Assert all tokens returned.
@@ -1932,11 +1932,11 @@ func TestFlowControlSendQueue(t *testing.T) {
 -- Send queue metrics from n1, n3's send queue should have been force-flushed.`)
 	h.query(n1, flowSendQueueQueryStr)
 	h.comment(`
--- Observe the total tracked tokens per-stream on n1, n3's flushed entries 
+-- Observe the total tracked tokens per-stream on n1, n3's flushed entries
 -- will also be tracked here.`)
 	h.query(n1, v2FlowPerStreamTrackedQueryStr, flowPerStreamTrackedQueryHeaderStrs...)
 	h.comment(`
--- Per-store tokens available from n1, these should reflect the deducted 
+-- Per-store tokens available from n1, these should reflect the deducted
 -- tokens from force-flushing n3.`)
 	h.query(n1, flowPerStoreTokenQueryStr, flowPerStoreTokenQueryHeaderStrs...)
 
@@ -2025,7 +2025,7 @@ func TestFlowControlSendQueue(t *testing.T) {
 	setTokenReturnEnabled(true /* enabled */, 0, 1, 2, 3, 4)
 	h.waitForAllTokensReturned(ctx, 5, 0 /* serverIdx */)
 	h.comment(`
--- Per-store tokens available from n1. Expect these to return to the same as 
+-- Per-store tokens available from n1. Expect these to return to the same as
 -- the initial state.
 `)
 	h.query(n1, flowPerStoreTokenQueryStr, flowPerStoreTokenQueryHeaderStrs...)
@@ -2060,7 +2060,7 @@ func TestFlowControlSendQueue(t *testing.T) {
 	h.comment(`
 -- Observe the total tracked tokens per-stream on n1. We should expect to see the
 -- 1 MiB write being tracked across a quorum of streams, while the 4 MiB write
--- is tracked across each stream (except s1). Two(/4 non-leader) replica send 
+-- is tracked across each stream (except s1). Two(/4 non-leader) replica send
 -- streams should be prevented from forming a send queue and have higher tracked
 -- tokens than the other two.
 `)
@@ -2246,7 +2246,7 @@ func TestFlowControlSendQueueManyInflight(t *testing.T) {
 -- queue prevented from forming. Lastly, we will unblock admission and stress
 -- the raft in-flights tracker as the queue is drained.`)
 	h.comment(`
--- Initial per-store tokens available from n1. 
+-- Initial per-store tokens available from n1.
 `)
 	h.query(n1, flowPerStoreTokenQueryStr, flowPerStoreTokenQueryHeaderStrs...)
 	h.comment(`-- (Blocking below-raft admission on [n1,n2,n3].)`)
@@ -2460,7 +2460,7 @@ func TestFlowControlSendQueueRangeRelocate(t *testing.T) {
 -- be tracked here.`)
 			h.query(n1, v2FlowPerStreamTrackedQueryStr, flowPerStreamTrackedQueryHeaderStrs...)
 			h.comment(`
--- Per-store tokens available from n1, these should reflect the lack of tokens 
+-- Per-store tokens available from n1, these should reflect the lack of tokens
 -- for s3.`)
 			h.query(n1, flowPerStoreTokenQueryStr, flowPerStoreTokenQueryHeaderStrs...)
 
@@ -2748,7 +2748,7 @@ func TestFlowControlRangeSplitMergeMixedVersion(t *testing.T) {
 	h.waitForSendQueueSize(ctx, merged.RangeID, 0 /* expSize 0 MiB */, 0 /* serverIdx */)
 
 	h.comment(`
--- Send queue and flow token metrics from n1, post-split-merge. 
+-- Send queue and flow token metrics from n1, post-split-merge.
 -- We do not expect to see the send queue develop for s3.`)
 	h.query(n1, flowSendQueueQueryStr)
 	h.query(n1, flowPerStoreTokenQueryStr, flowPerStoreTokenQueryHeaderStrs...)
@@ -2961,7 +2961,7 @@ func TestFlowControlSendQueueRangeMigrate(t *testing.T) {
 -- be tracked here.`)
 	h.query(n1, v2FlowPerStreamTrackedQueryStr, flowPerStreamTrackedQueryHeaderStrs...)
 	h.comment(`
--- Per-store tokens available from n1, these should reflect the lack of tokens 
+-- Per-store tokens available from n1, these should reflect the lack of tokens
 -- for s3.`)
 	h.query(n1, flowPerStoreTokenQueryStr, flowPerStoreTokenQueryHeaderStrs...)
 
@@ -3146,7 +3146,7 @@ func TestFlowControlSendQueueRangeSplitMerge(t *testing.T) {
 -- be tracked here.`)
 	h.query(n1, v2FlowPerStreamTrackedQueryStr, flowPerStreamTrackedQueryHeaderStrs...)
 	h.comment(`
--- Per-store tokens available from n1, these should reflect the lack of tokens 
+-- Per-store tokens available from n1, these should reflect the lack of tokens
 -- for s3.`)
 	h.query(n1, flowPerStoreTokenQueryStr, flowPerStoreTokenQueryHeaderStrs...)
 
@@ -3417,7 +3417,7 @@ func TestFlowControlSendQueueRangeFeed(t *testing.T) {
 -- n3, using 4x1 MiB (deduction, the write itself is small) writes. Then,
 -- we will write 1 MiB to the range and wait for the closedTS to fall
 -- behind on n3. We expect that the closedTS falling behind will trigger
--- an error that is returned to the mux rangefeed client, which will in turn 
+-- an error that is returned to the mux rangefeed client, which will in turn
 -- allows the rangefeed  request to be re-routed to another replica.`)
 	// Block admission on n3, while allowing every other node to admit.
 	setTokenReturnEnabled(true /* enabled */, 0, 1)
@@ -3451,7 +3451,7 @@ func TestFlowControlSendQueueRangeFeed(t *testing.T) {
 -- be tracked here.`)
 	h.query(n1, v2FlowPerStreamTrackedQueryStr, flowPerStreamTrackedQueryHeaderStrs...)
 	h.comment(`
--- Per-store tokens available from n1, these should reflect the lack of tokens 
+-- Per-store tokens available from n1, these should reflect the lack of tokens
 -- for s3.`)
 	h.query(n1, flowPerStoreTokenQueryStr, flowPerStoreTokenQueryHeaderStrs...)
 
@@ -3820,12 +3820,12 @@ var flowPerStoreDeductionQueryHeaderStrs = []string{
 // v2FlowTokensQueryStr is the query string to fetch flow tokens metrics from
 // the node metrics table.
 const v2FlowTokensQueryStr = `
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;
@@ -3834,12 +3834,12 @@ ORDER BY
 // flowSendQueueQueryStr is the query string to fetch flow control send queue
 // metrics from the node metrics table.
 const flowSendQueueQueryStr = `
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%send_queue%'
   AND name != 'kvflowcontrol.send_queue.count'
 ORDER BY

pkg/kv/kvserver/testdata/flow_control_integration_v2/admission_post_split_merge_v2_encoding_apply_to_all

@@ -11,12 +11,12 @@ echo
 -- that are yet to get admitted. We see 2*3*1MiB=6MiB deductions of
 -- {regular,elastic} tokens with no corresponding returns. The 2*1MiB writes
 -- happened on what is soon going to be the LHS and RHS of a range being split.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;
@@ -65,12 +65,12 @@ ORDER BY
 -- post-split LHS and RHS ranges respectively. We should see 15MiB extra tokens
 -- deducted which comes from (2MiB+3MiB)*3=15MiB. So we stand at
 -- 6MiB+15MiB=21MiB now.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;
@@ -131,12 +131,12 @@ ORDER BY
 -- from 4MiB*3=12MiB. So we stand at 21MiB+12MiB=33MiB tokens deducted now. The
 -- RHS of the range is gone now, and the previously 3*3MiB=9MiB of tokens
 -- deducted for it are released at the subsuming LHS leaseholder.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;
@@ -189,12 +189,12 @@ ORDER BY
 -- {regular,elastic} tokens returned, including those from:
 -- - the LHS before the merge, and
 -- - the LHS and RHS before the original split.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;

pkg/kv/kvserver/testdata/flow_control_integration_v2/admission_post_split_merge_v2_encoding_apply_to_elastic

@@ -11,12 +11,12 @@ echo
 -- that are yet to get admitted. We see 2*3*1MiB=6MiB deductions of
 -- {regular,elastic} tokens with no corresponding returns. The 2*1MiB writes
 -- happened on what is soon going to be the LHS and RHS of a range being split.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;
@@ -65,12 +65,12 @@ ORDER BY
 -- post-split LHS and RHS ranges respectively. We should see 15MiB extra tokens
 -- deducted which comes from (2MiB+3MiB)*3=15MiB. So we stand at
 -- 6MiB+15MiB=21MiB now.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;
@@ -131,12 +131,12 @@ ORDER BY
 -- from 4MiB*3=12MiB. So we stand at 21MiB+12MiB=33MiB tokens deducted now. The
 -- RHS of the range is gone now, and the previously 3*3MiB=9MiB of tokens
 -- deducted for it are released at the subsuming LHS leaseholder.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;
@@ -189,12 +189,12 @@ ORDER BY
 -- {regular,elastic} tokens returned, including those from:
 -- - the LHS before the merge, and
 -- - the LHS and RHS before the original split.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;

pkg/kv/kvserver/testdata/flow_control_integration_v2/basic_v2_encoding_apply_to_all

@@ -2,12 +2,12 @@ echo
 ----
 ----
 -- Flow token metrics, before issuing the 1MiB replicated write.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;
@@ -78,12 +78,12 @@ ORDER BY
 -- and it being admitted on n1, n2 and n3. We should see 3*1MiB = 3MiB of
 -- {regular,elastic} tokens deducted and returned, and {8*3=24MiB,16*3=48MiB} of
 -- {regular,elastic} tokens available. Everything should be accounted for.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;

pkg/kv/kvserver/testdata/flow_control_integration_v2/basic_v2_encoding_apply_to_elastic

@@ -2,12 +2,12 @@ echo
 ----
 ----
 -- Flow token metrics, before issuing the 1MiB replicated write.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;
@@ -78,12 +78,12 @@ ORDER BY
 -- and it being admitted on n1, n2 and n3. We should see 3*1MiB = 3MiB of
 -- {regular,elastic} tokens deducted and returned, and {8*3=24MiB,16*3=48MiB} of
 -- {regular,elastic} tokens available. Everything should be accounted for.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;

pkg/kv/kvserver/testdata/flow_control_integration_v2/blocked_admission_v2_encoding_apply_to_all

@@ -7,12 +7,12 @@ echo
 -- Flow token metrics from n1 after issuing 5 1MiB 3x replicated writes
 -- that are yet to get admitted. We see 5*1MiB*3=15MiB deductions of
 -- {regular,elastic} tokens with no corresponding returns.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;
@@ -95,12 +95,12 @@ ORDER BY
 -- Flow token metrics from n1 after work gets admitted. We see 15MiB returns of
 -- {regular,elastic} tokens, and the available capacities going back to what
 -- they were.
-SELECT 
+SELECT
   name,
   crdb_internal.humanize_bytes(value::INT8)
-FROM 
+FROM
   crdb_internal.node_metrics
-WHERE 
+WHERE
   name LIKE '%kvflowcontrol%tokens%'
 ORDER BY
   name ASC;