You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/12/09 03:51:15 UTC

[1/3] accumulo git commit: ACCUMULO-3269 Add a brief sleep before retrying ruok

Repository: accumulo
Updated Branches:
  refs/heads/1.6 8f4eae77d -> 6170c02ee
  refs/heads/master 0f2bd37d4 -> ab4cc79ac


ACCUMULO-3269 Add a brief sleep before retrying ruok


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

Branch: refs/heads/1.6
Commit: 6170c02ee99bb5a03d83441a96882f5767b2bde2
Parents: 8f4eae7
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 8 21:07:09 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 8 21:49:00 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java  | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6170c02e/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 8877b5d..19d7746 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -551,6 +551,8 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
               throw new ZooKeeperBindException("Zookeeper did not start within " + (config.getZooKeeperStartupTime() / 1000) + " seconds. Check the logs in "
                   + config.getLogDir() + " for errors.  Last exception: " + e);
             }
+            // Don't spin absurdly fast
+            Thread.sleep(250);
           } finally {
             if (s != null)
               s.close();

[3/3] accumulo git commit: Merge branch '1.6'

Posted by el...@apache.org.
Merge branch '1.6'


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

Branch: refs/heads/master
Commit: ab4cc79accd1974289cd3c67873709fe345efef7
Parents: 0f2bd37 6170c02
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 8 21:50:50 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 8 21:50:50 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java  | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab4cc79a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------

[2/3] accumulo git commit: ACCUMULO-3269 Add a brief sleep before retrying ruok

Posted by el...@apache.org.
ACCUMULO-3269 Add a brief sleep before retrying ruok


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

Branch: refs/heads/master
Commit: 6170c02ee99bb5a03d83441a96882f5767b2bde2
Parents: 8f4eae7
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 8 21:07:09 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 8 21:49:00 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java  | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6170c02e/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 8877b5d..19d7746 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -551,6 +551,8 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
               throw new ZooKeeperBindException("Zookeeper did not start within " + (config.getZooKeeperStartupTime() / 1000) + " seconds. Check the logs in "
                   + config.getLogDir() + " for errors.  Last exception: " + e);
             }
+            // Don't spin absurdly fast
+            Thread.sleep(250);
           } finally {
             if (s != null)
               s.close();