Merge pull request #153183 from cockroachdb/blathers/backport-release-24.3-145461

wenyihu6 · web-flow · commit 128eab948d61 · 2025-09-08T15:56:31.000-04:00
release-24.3: kvserver: reset lb splitter on all queue splits
diff --git a/pkg/kv/kvserver/split_queue.go b/pkg/kv/kvserver/split_queue.go
@@ -303,6 +303,9 @@ func (sq *splitQueue) processAttempt(
 			return false, errors.Wrapf(err, "unable to split %s at key %q", r, splitKey)
 		}
 		sq.metrics.SpanConfigBasedSplitCount.Inc(1)
+
+		// Reset the splitter now that the bounds of the range changed.
+		r.loadBasedSplitter.Reset(sq.store.Clock().PhysicalTime())
 		return true, nil
 	}
 
@@ -328,6 +331,9 @@ func (sq *splitQueue) processAttempt(
 			return false, err
 		}
 		sq.metrics.SizeBasedSplitCount.Inc(1)
+
+		// Reset the splitter now that the bounds of the range changed.
+		r.loadBasedSplitter.Reset(sq.store.Clock().PhysicalTime())
 		return true, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,9 @@ func (sq *splitQueue) processAttempt(`
`303`	`303`	`return false, errors.Wrapf(err, "unable to split %s at key %q", r, splitKey)`
`304`	`304`	`}`
`305`	`305`	`sq.metrics.SpanConfigBasedSplitCount.Inc(1)`
	`306`	`+`
	`307`	`+ // Reset the splitter now that the bounds of the range changed.`
	`308`	`+ r.loadBasedSplitter.Reset(sq.store.Clock().PhysicalTime())`
`306`	`309`	`return true, nil`
`307`	`310`	`}`
`308`	`311`
`@@ -328,6 +331,9 @@ func (sq *splitQueue) processAttempt(`
`328`	`331`	`return false, err`
`329`	`332`	`}`
`330`	`333`	`sq.metrics.SizeBasedSplitCount.Inc(1)`
	`334`	`+`
	`335`	`+ // Reset the splitter now that the bounds of the range changed.`
	`336`	`+ r.loadBasedSplitter.Reset(sq.store.Clock().PhysicalTime())`
`331`	`337`	`return true, nil`
`332`	`338`	`}`
`333`	`339`