Repository: accumulo Updated Branches: refs/heads/master c39079691 -> be7a43f62
ACCUMULO-3009 ensure that there have been no important events between balance calls Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/611a1a3a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/611a1a3a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/611a1a3a Branch: refs/heads/master Commit: 611a1a3ab597ca7ebd3905a7d000153e6e596222 Parents: a458a2f Author: Eric C. Newton <eric.new...@gmail.com> Authored: Thu Aug 7 12:20:46 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Thu Aug 7 12:20:46 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/master/Master.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/611a1a3a/server/master/src/main/java/org/apache/accumulo/master/Master.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index 11b5345..a8c6afa 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -33,8 +33,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import javax.management.StandardMBean; - import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; @@ -1373,13 +1371,15 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt public void waitForBalance(TInfo tinfo) { synchronized (balancedNotifier) { + long eventCounter; do { + eventCounter = nextEvent.waitForEvents(0, 0); try { balancedNotifier.wait(); } catch (InterruptedException e) { log.debug(e.toString(), e); } - } while (displayUnassigned() > 0 || migrations.size() > 0); + } while (displayUnassigned() > 0 || migrations.size() > 0 || eventCounter != nextEvent.waitForEvents(0, 0)); } } }
