You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/03/04 19:21:23 UTC
[1/3] git commit: Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Repository: accumulo
Updated Branches:
refs/heads/master 5aec59afc -> efd6261be
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ca61fe81
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca61fe81
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca61fe81
Branch: refs/heads/master
Commit: ca61fe814db20da7d532259847cfeccc0b2a4204
Parents: 9ff2c45 9abf942
Author: Eric Newton <er...@gmail.com>
Authored: Tue Mar 4 12:46:55 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Mar 4 12:46:55 2014 -0500
----------------------------------------------------------------------
.../apache/accumulo/fate/zookeeper/ZooLock.java | 43 +++++++++++++----
.../java/org/apache/accumulo/master/Master.java | 1 +
.../test/continuous/ContinuousBatchWalker.java | 2 +-
.../test/continuous/ContinuousIngest.java | 9 ++--
.../test/continuous/ContinuousQuery.java | 2 +-
.../test/continuous/ContinuousScanner.java | 2 +-
.../test/continuous/ContinuousUtil.java | 49 ++++++++++++++++++++
.../test/continuous/ContinuousWalk.java | 2 +-
8 files changed, 91 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-2427 give zk a little more time to start
up... still failing with no output
Posted by ec...@apache.org.
ACCUMULO-2427 give zk a little more time to start up... still failing with no output
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2f7b9d30
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2f7b9d30
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2f7b9d30
Branch: refs/heads/master
Commit: 2f7b9d306ab5b75e8b99d8ca0de1f25ddfcf53d5
Parents: ca61fe8
Author: Eric Newton <er...@gmail.com>
Authored: Tue Mar 4 13:21:32 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Mar 4 13:21:32 2014 -0500
----------------------------------------------------------------------
.../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2f7b9d30/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 492205e..8a9736d 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
@@ -130,6 +130,8 @@ public class MiniAccumuloClusterImpl {
}
}
+ private static final long ZOOKEEPER_STARTUP_WAIT = 20*1000;
+
private boolean initialized = false;
private Process zooKeeperProcess = null;
private Process masterProcess = null;
@@ -452,8 +454,8 @@ public class MiniAccumuloClusterImpl {
if (n >= 4 && new String(buffer, 0, 4).equals("imok"))
break;
} catch (Exception e) {
- if (System.currentTimeMillis() - startTime >= 10000) {
- throw new RuntimeException("Zookeeper did not start within 10 seconds. Check the logs in " + config.getLogDir() + " for errors. Last exception: " + e);
+ if (System.currentTimeMillis() - startTime >= ZOOKEEPER_STARTUP_WAIT) {
+ throw new RuntimeException("Zookeeper did not start within " + (ZOOKEEPER_STARTUP_WAIT/1000) + " seconds. Check the logs in " + config.getLogDir() + " for errors. Last exception: " + e);
}
UtilWaitThread.sleep(250);
} finally {
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/efd6261b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/efd6261b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/efd6261b
Branch: refs/heads/master
Commit: efd6261be85f4d4a686df0540ed6116ca227de79
Parents: 5aec59a 2f7b9d3
Author: Eric Newton <er...@gmail.com>
Authored: Tue Mar 4 13:21:42 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Mar 4 13:21:42 2014 -0500
----------------------------------------------------------------------
.../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/efd6261b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------