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

…-23.1-102825
cockroachdb · May 30, 2023 · b3d54e3 · b3d54e3
2 parents d56c6ee + 518fd7e
commit b3d54e3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/pkg/kv/kvserver/allocator/storepool/store_pool.go b/pkg/kv/kvserver/allocator/storepool/store_pool.go
@@ -1087,7 +1087,7 @@ func MakeStoreList(descriptors []roachpb.StoreDescriptor) StoreList {
 func (sl StoreList) String() string {
 	var buf bytes.Buffer
 	fmt.Fprintf(&buf,
-		"  candidate: avg-ranges=%v avg-leases=%v avg-disk-usage=%v avg-queries-per-second=%v avg-store-cpu-per-second=%v",
+		"  candidate: avg-ranges=%.2f avg-leases=%.2f avg-disk-usage=%s avg-queries-per-second=%.2f avg-store-cpu-per-second=%s",
 		sl.CandidateRanges.Mean,
 		sl.CandidateLeases.Mean,
 		humanizeutil.IBytes(int64(sl.candidateLogicalBytes.Mean)),

diff --git a/pkg/kv/kvserver/rebalance_objective.go b/pkg/kv/kvserver/rebalance_objective.go
@@ -92,6 +92,17 @@ const (
 	LBRebalancingCPU
 )
 
+// LoadBasedRebalancingObjectiveMap maps the LoadBasedRebalancingObjective enum
+// value to a string.
+var LoadBasedRebalancingObjectiveMap map[int64]string = map[int64]string{
+	int64(LBRebalancingQueries): "qps",
+	int64(LBRebalancingCPU):     "cpu",
+}
+
+func (lbro LBRebalancingObjective) String() string {
+	return LoadBasedRebalancingObjectiveMap[int64(lbro)]
+}
+
 // LoadBasedRebalancingObjective is a cluster setting that defines the load
 // balancing objective of the cluster.
 var LoadBasedRebalancingObjective = settings.RegisterEnumSetting(
@@ -101,10 +112,7 @@ var LoadBasedRebalancingObjective = settings.RegisterEnumSetting(
 		"the cluster will attempt to balance qps among stores, if set to "+
 		"`cpu` the cluster will attempt to balance cpu usage among stores",
 	"cpu",
-	map[int64]string{
-		int64(LBRebalancingQueries): "qps",
-		int64(LBRebalancingCPU):     "cpu",
-	},
+	LoadBasedRebalancingObjectiveMap,
 ).WithPublic()
 
 // ToDimension returns the equivalent allocator load dimension of a rebalancing

diff --git a/pkg/kv/kvserver/store_rebalancer.go b/pkg/kv/kvserver/store_rebalancer.go
@@ -276,6 +276,9 @@ func (sr *StoreRebalancer) Start(ctx context.Context, stopper *stop.Stopper) {
 				continue
 			}
 			objective := sr.RebalanceObjective()
+			sr.AddLogTag("obj", objective)
+			ctx = sr.AnnotateCtx(ctx)
+
 			hottestRanges := sr.replicaRankings.TopLoad(objective.ToDimension())
 			options := sr.scorerOptions(ctx, objective.ToDimension())
 			rctx := sr.NewRebalanceContext(ctx, options, hottestRanges, mode)