Repository: hbase Updated Branches: refs/heads/branch-1 a1b956eb3 -> c95bf404b
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/c95bf404 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c95bf404 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c95bf404 Branch: refs/heads/branch-1 Commit: c95bf404b7ceb97c2f9b08fdc8029849217262f9 Parents: a1b956e Author: Jimmy Xiang <[email protected]> Authored: Thu Sep 11 10:17:05 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Thu Sep 11 10:22:28 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/c95bf404/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(); }
