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 2015/01/09 20:54:01 UTC
[1/3] accumulo git commit: ACCUMULO-3468 Increase zk timeout in
MonitorUtil.
Repository: accumulo
Updated Branches:
refs/heads/1.6 64567e74d -> 02142ff41
refs/heads/master 61b0fb714 -> 55b60dd65
ACCUMULO-3468 Increase zk timeout in MonitorUtil.
Causes troubles in MonitorLoggingIT from being too low.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/02142ff4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/02142ff4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/02142ff4
Branch: refs/heads/1.6
Commit: 02142ff4154e81d9d0e355470a9e0780c7c3ada0
Parents: 64567e7
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 9 13:00:44 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 9 14:41:31 2015 -0500
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/02142ff4/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java b/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
index 2726aeb..309f323 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
@@ -26,7 +26,7 @@ import org.apache.zookeeper.KeeperException;
public class MonitorUtil {
public static String getLocation(Instance instance) throws KeeperException, InterruptedException {
- ZooReader zr = new ZooReader(instance.getZooKeepers(), 5000);
+ ZooReader zr = new ZooReader(instance.getZooKeepers(), 30000);
byte[] loc = zr.getData(ZooUtil.getRoot(instance) + Constants.ZMONITOR_HTTP_ADDR, null);
return loc == null ? null : new String(loc, UTF_8);
}
[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/55b60dd6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/55b60dd6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/55b60dd6
Branch: refs/heads/master
Commit: 55b60dd65cd73009f1d7edce5ce965f49a4294c7
Parents: 61b0fb7 02142ff
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 9 14:44:55 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 9 14:44:55 2015 -0500
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/55b60dd6/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
----------------------------------------------------------------------
[2/3] accumulo git commit: ACCUMULO-3468 Increase zk timeout in
MonitorUtil.
Posted by el...@apache.org.
ACCUMULO-3468 Increase zk timeout in MonitorUtil.
Causes troubles in MonitorLoggingIT from being too low.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/02142ff4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/02142ff4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/02142ff4
Branch: refs/heads/master
Commit: 02142ff4154e81d9d0e355470a9e0780c7c3ada0
Parents: 64567e7
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 9 13:00:44 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 9 14:41:31 2015 -0500
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/02142ff4/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java b/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
index 2726aeb..309f323 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
@@ -26,7 +26,7 @@ import org.apache.zookeeper.KeeperException;
public class MonitorUtil {
public static String getLocation(Instance instance) throws KeeperException, InterruptedException {
- ZooReader zr = new ZooReader(instance.getZooKeepers(), 5000);
+ ZooReader zr = new ZooReader(instance.getZooKeepers(), 30000);
byte[] loc = zr.getData(ZooUtil.getRoot(instance) + Constants.ZMONITOR_HTTP_ADDR, null);
return loc == null ? null : new String(loc, UTF_8);
}