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:33 UTC
[1/6] hbase git commit: Revert "HBASE-18164 Fast locality computation
in balancer - addendum handles NaN"
Repository: hbase
Updated Branches:
refs/heads/branch-1 a88310e9a -> bb181ff50
refs/heads/branch-2 d5e206dfa -> 812b38332
refs/heads/master 293cb87d5 -> 8da6f069c
Revert "HBASE-18164 Fast locality computation in balancer - addendum handles NaN"
This reverts commit 74e9d314749a24ecdeebecfb801416efd71c3b79.
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/386a6e87
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/386a6e87
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/386a6e87
Branch: refs/heads/branch-1
Commit: 386a6e87fecd2971354028cfebd4d19fd9dfe599
Parents: a88310e
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Jun 27 13:33:23 2017 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Tue Jun 27 13:33:23 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/386a6e87/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 419f051..6f99f44 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
@@ -1279,9 +1279,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
@@ -1292,7 +1291,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;
}
[2/6] hbase git commit: HBASE-18164 Fast locality computation in
balancer - addendum handles NaN
Posted by bu...@apache.org.
HBASE-18164 Fast locality computation in balancer - addendum handles NaN
Signed-off-by: tedyu <yu...@gmail.com>
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bb181ff5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bb181ff5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bb181ff5
Branch: refs/heads/branch-1
Commit: bb181ff50bd60120bcda463d6d71db8505170e88
Parents: 386a6e8
Author: Kahlil Oppenheimer <ka...@gmail.com>
Authored: Tue Jun 6 15:53:43 2017 -0400
Committer: Sean Busbey <bu...@apache.org>
Committed: Tue Jun 27 13:33:48 2017 -0500
----------------------------------------------------------------------
.../hadoop/hbase/master/balancer/StochasticLoadBalancer.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/bb181ff5/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 6f99f44..0f29a1a 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
@@ -1279,8 +1279,9 @@ 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
- locality /= bestLocality;
+ // 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.0 : locality / bestLocality;
}
@Override
@@ -1291,7 +1292,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
return;
}
double localityDelta = getWeightedLocality(region, newEntity) - getWeightedLocality(region, oldEntity);
- double normalizedDelta = localityDelta / bestLocality;
+ double normalizedDelta = bestLocality == 0 ? 0.0 : localityDelta / bestLocality;
locality += normalizedDelta;
}
[5/6] hbase git commit: Revert "HBASE-18164 Fast locality computation
in balancer - addendum handles NaN"
Posted by bu...@apache.org.
Revert "HBASE-18164 Fast locality computation in balancer - addendum handles NaN"
This reverts commit b4c3fe97638a4bcd4d950f6c571315d320ca47f3.
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/0ad8f266
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0ad8f266
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0ad8f266
Branch: refs/heads/branch-2
Commit: 0ad8f26662412fd9a7e61fa00e13ab29cb1e203d
Parents: d5e206d
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Jun 27 13:31:40 2017 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Tue Jun 27 14:58:03 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/0ad8f266/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;
}
[3/6] hbase git commit: Revert "HBASE-18164 Fast locality computation
in balancer - addendum handles NaN"
Posted by bu...@apache.org.
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;
}
[4/6] hbase git commit: HBASE-18164 Fast locality computation in
balancer - addendum handles NaN
Posted by bu...@apache.org.
HBASE-18164 Fast locality computation in balancer - addendum handles NaN
Signed-off-by: tedyu <yu...@gmail.com>
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8da6f069
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8da6f069
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8da6f069
Branch: refs/heads/master
Commit: 8da6f069c307d7cf0b8d56281189e84108c7430b
Parents: 1414825
Author: Kahlil Oppenheimer <ka...@gmail.com>
Authored: Tue Jun 6 15:53:43 2017 -0400
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, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8da6f069/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 63ec0b5..6f05581 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,8 +1286,9 @@ 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
- locality /= bestLocality;
+ // 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.0 : locality / bestLocality;
}
@Override
@@ -1298,7 +1299,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
return;
}
double localityDelta = getWeightedLocality(region, newEntity) - getWeightedLocality(region, oldEntity);
- double normalizedDelta = localityDelta / bestLocality;
+ double normalizedDelta = bestLocality == 0 ? 0.0 : localityDelta / bestLocality;
locality += normalizedDelta;
}
[6/6] hbase git commit: HBASE-18164 Fast locality computation in
balancer - addendum handles NaN
Posted by bu...@apache.org.
HBASE-18164 Fast locality computation in balancer - addendum handles NaN
Signed-off-by: tedyu <yu...@gmail.com>
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/812b3833
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/812b3833
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/812b3833
Branch: refs/heads/branch-2
Commit: 812b38332557b497560655005c839a92543a80ec
Parents: 0ad8f26
Author: Kahlil Oppenheimer <ka...@gmail.com>
Authored: Tue Jun 6 15:53:43 2017 -0400
Committer: Sean Busbey <bu...@apache.org>
Committed: Tue Jun 27 14:58:03 2017 -0500
----------------------------------------------------------------------
.../hadoop/hbase/master/balancer/StochasticLoadBalancer.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/812b3833/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 63ec0b5..6f05581 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,8 +1286,9 @@ 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
- locality /= bestLocality;
+ // 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.0 : locality / bestLocality;
}
@Override
@@ -1298,7 +1299,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
return;
}
double localityDelta = getWeightedLocality(region, newEntity) - getWeightedLocality(region, oldEntity);
- double normalizedDelta = localityDelta / bestLocality;
+ double normalizedDelta = bestLocality == 0 ? 0.0 : localityDelta / bestLocality;
locality += normalizedDelta;
}