Merge #133489

133489: storage: use cluster version in benchmark data key r=RaduBerinde a=jbowens Incorporate the cluster version into the storage package's microbenchmark fixture data naming scheme. This avoids failures due to attempting to open a store at an unsupported cluster version. Fix #133384. Epic: none Release note: none Co-authored-by: Jackson Owens <[email protected]>
cockroachdb · Oct 25, 2024 · 7495c03 · 7495c03
2 parents 163ee9a + 77c7d2d
commit 7495c03
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/storage/bench_data_test.go b/pkg/storage/bench_data_test.go
@@ -210,7 +210,7 @@ var _ initialState = mvccBenchData{}
 func (d mvccBenchData) Key() []string {
 	key := []string{
 		"mvcc",
-		fmt.Sprintf("fmtver_%d", previousReleaseFormatMajorVersion),
+		fmt.Sprintf("cv_%s", clusterversion.PreviousRelease.Version()),
 		fmt.Sprintf("numKeys_%d", d.numKeys),
 		fmt.Sprintf("numVersions_%d", d.numVersions),
 		fmt.Sprintf("valueBytes_%d", d.valueBytes),
@@ -428,7 +428,7 @@ var _ initialState = mvccImportedData{}
 func (i mvccImportedData) Key() []string {
 	key := []string{
 		"mvcc",
-		fmt.Sprintf("fmtver_%d", previousReleaseFormatMajorVersion),
+		fmt.Sprintf("cv_%s", clusterversion.PreviousRelease.Version()),
 		fmt.Sprintf("streak_%d", i.streakBound),
 		fmt.Sprintf("keys_%d", i.keyCount),
 		fmt.Sprintf("valueBytes_%d", i.valueBytes),