This is an automated email from the ASF dual-hosted git repository. rmattingly pushed a commit to branch HBASE-29073-branch-2.6 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 21f23a39678de12bb69c1fa01a1316230347fa91 Author: Ray Mattingly <[email protected]> AuthorDate: Tue Jan 28 15:28:39 2025 -0500 HBASE-29073 StochasticLoadBalancer will always run the balancer on startup because of uninitialized sumMultiplier (#6641) Co-authored-by: Ray Mattingly <[email protected]> Signed-off-by: Nick Dimiduk <[email protected]> --- .../hadoop/hbase/master/balancer/StochasticLoadBalancer.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java index 46efb4d499d..71709228d5a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java @@ -412,14 +412,16 @@ public class StochasticLoadBalancer extends BaseLoadBalancer { } double total = 0.0; + float localSumMultiplier = 0; // in case this.sumMultiplier is not initialized for (CostFunction c : costFunctions) { if (!c.isNeeded()) { LOG.trace("{} not needed", c.getClass().getSimpleName()); continue; } total += c.cost() * c.getMultiplier(); + localSumMultiplier += c.getMultiplier(); } - + sumMultiplier = localSumMultiplier; boolean balanced = (total / sumMultiplier < minCostNeedBalance); if (balanced) { if (isBalancerRejectionRecording) { @@ -553,12 +555,13 @@ public class StochasticLoadBalancer extends BaseLoadBalancer { long startTime = EnvironmentEdgeManager.currentTime(); initCosts(cluster); - sumMultiplier = 0; + float localSumMultiplier = 0; for (CostFunction c : costFunctions) { if (c.isNeeded()) { - sumMultiplier += c.getMultiplier(); + localSumMultiplier += c.getMultiplier(); } } + sumMultiplier = localSumMultiplier; if (sumMultiplier <= 0) { LOG.error("At least one cost function needs a multiplier > 0. For example, set " + "hbase.master.balancer.stochastic.regionCountCost to a positive value or default");
