Repository: hbase
Updated Branches:
  refs/heads/master d4850f1f1 -> a6314e257


HBASE-11947 NoSuchElementException in balancer for master regions (Sergey 
Soldatov and Jimmy Xiang)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a6314e25
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a6314e25
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a6314e25

Branch: refs/heads/master
Commit: a6314e2578fe649af01a0a10fdc3e77e32b6bba4
Parents: d4850f1
Author: Jimmy Xiang <[email protected]>
Authored: Thu Sep 11 10:17:05 2014 -0700
Committer: Jimmy Xiang <[email protected]>
Committed: Thu Sep 11 10:18:36 2014 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/a6314e25/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
index c06097c..d0c0a92 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
@@ -965,6 +965,9 @@ public abstract class BaseLoadBalancer implements 
LoadBalancer {
         }
         ServerName dest = keyIt.next();
         if (masterServerName.equals(dest)) {
+          if (!keyIt.hasNext()) {
+            keyIt = clusterMap.keySet().iterator();
+          }
           dest = keyIt.next();
         }
 

Reply via email to