You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/06/27 19:58:35 UTC
[3/6] hbase git commit: Revert "HBASE-18164 Fast locality computation
in balancer - addendum handles NaN"
Revert "HBASE-18164 Fast locality computation in balancer - addendum handles NaN"
This reverts commit 35693f0583bd358dc5ecae2d09acb1bbf3676cfa.
early commit missed some review feedback.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/14148251
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/14148251
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/14148251
Branch: refs/heads/master
Commit: 141482512a617a2a05c5dcf0c84fd81385d5b008
Parents: 293cb87
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Jun 27 13:29:22 2017 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Tue Jun 27 14:57:53 2017 -0500
----------------------------------------------------------------------
.../hadoop/hbase/master/balancer/StochasticLoadBalancer.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/14148251/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
----------------------------------------------------------------------
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 ece9153..63ec0b5 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
@@ -1286,9 +1286,8 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
}
// We normalize locality to be a score between 0 and 1.0 representing how good it
- // is compared to how good it could be. If bestLocality is 0, assume locality is 100
- // (and the cost is 0)
- locality = bestLocality == 0 ? 1 : locality / bestLocality;
+ // is compared to how good it could be
+ locality /= bestLocality;
}
@Override
@@ -1299,7 +1298,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
return;
}
double localityDelta = getWeightedLocality(region, newEntity) - getWeightedLocality(region, oldEntity);
- double normalizedDelta = bestLocality == 0 ? 0.0 : localityDelta / bestLocality;
+ double normalizedDelta = localityDelta / bestLocality;
locality += normalizedDelta;
}