Merge pull request #102482 from cockroachdb/blathers/backport-release…

…-23.1-102291 release-23.1: split: add additional lb split tests and fix decider weight
cockroachdb · May 10, 2023 · 6c6d665 · 6c6d665
2 parents e14e511 + 5df42dc
commit 6c6d665
Show file tree

Hide file tree

Showing 9 changed files with 1,292 additions and 295 deletions.
diff --git a/pkg/cmd/roachtest/tests/split.go b/pkg/cmd/roachtest/tests/split.go
diff --git a/pkg/kv/kvserver/split/BUILD.bazel b/pkg/kv/kvserver/split/BUILD.bazel
@@ -31,16 +31,20 @@ go_test(
         "weighted_finder_test.go",
     ],
     args = ["-test.timeout=55s"],
+    data = glob(["testdata/**"]),
     embed = [":split"],
     deps = [
         "//pkg/keys",
         "//pkg/roachpb",
+        "//pkg/testutils/datapathutils",
+        "//pkg/testutils/skip",
         "//pkg/util/encoding",
         "//pkg/util/leaktest",
         "//pkg/util/metric",
         "//pkg/util/stop",
         "//pkg/util/timeutil",
         "//pkg/workload/ycsb",
+        "@com_github_cockroachdb_datadriven//:datadriven",
         "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//require",
         "@org_golang_x_exp//rand",

diff --git a/pkg/kv/kvserver/split/decider.go b/pkg/kv/kvserver/split/decider.go
@@ -229,7 +229,7 @@ func (d *Decider) recordLocked(
 	if d.mu.splitFinder != nil && n != 0 {
 		s := span()
 		if s.Key != nil {
-			d.mu.splitFinder.Record(span(), 1)
+			d.mu.splitFinder.Record(span(), float64(n))
 		}
 		if d.mu.splitFinder.Ready(now) {
 			if d.mu.splitFinder.Key() != nil {