You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/03/15 18:50:27 UTC
svn commit: r1577912 - in
/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer:
BaseLoadBalancer.java ClusterLoadState.java
Author: tedyu
Date: Sat Mar 15 17:50:26 2014
New Revision: 1577912
URL: http://svn.apache.org/r1577912
Log:
HBASE-10760 Wrong methods' names in ClusterLoadState class (Victor Xu)
Modified:
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/ClusterLoadState.java
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java?rev=1577912&r1=1577911&r2=1577912&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java Sat Mar 15 17:50:26 2014
@@ -397,7 +397,7 @@ public abstract class BaseLoadBalancer i
float average = cs.getLoadAverage(); // for logging
int floor = (int) Math.floor(average * (1 - slop));
int ceiling = (int) Math.ceil(average * (1 + slop));
- if (!(cs.getMinLoad() > ceiling || cs.getMaxLoad() < floor)) {
+ if (!(cs.getMaxLoad() > ceiling || cs.getMinLoad() < floor)) {
NavigableMap<ServerAndLoad, List<HRegionInfo>> serversByLoad = cs.getServersByLoad();
if (LOG.isTraceEnabled()) {
// If nothing to balance, then don't say anything unless trace-level logging.
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/ClusterLoadState.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/ClusterLoadState.java?rev=1577912&r1=1577911&r2=1577912&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/ClusterLoadState.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/ClusterLoadState.java Sat Mar 15 17:50:26 2014
@@ -75,11 +75,11 @@ public class ClusterLoadState {
return (float) numRegions / numServers;
}
- int getMinLoad() {
+ int getMaxLoad() {
return getServersByLoad().lastKey().getLoad();
}
- int getMaxLoad() {
+ int getMinLoad() {
return getServersByLoad().firstKey().getLoad();
}