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/02/26 23:14:10 UTC
accumulo git commit: ACCUMULO-3628 Increase ZK timeout and parse
value as protobuf before toString()
Repository: accumulo
Updated Branches:
refs/heads/master 6b94344d4 -> 4b68322ff
ACCUMULO-3628 Increase ZK timeout and parse value as protobuf before toString()
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4b68322f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b68322f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4b68322f
Branch: refs/heads/master
Commit: 4b68322ff4419e8d47b0cf9841533d5d9802c2bb
Parents: 6b94344
Author: Josh Elser <el...@apache.org>
Authored: Thu Feb 26 11:22:27 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Feb 26 17:13:53 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/replication/ReplicationIT.java | 4 ++--
.../test/replication/UnorderedWorkAssignerReplicationIT.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4b68322f/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
index 185a33a..1c359b1 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@ -113,7 +113,7 @@ public class ReplicationIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
// Run the master replication loop run frequently
- cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "3s");
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "10s");
cfg.setProperty(Property.MASTER_REPLICATION_SCAN_INTERVAL, "1s");
cfg.setProperty(Property.REPLICATION_WORK_ASSIGNMENT_SLEEP, "1s");
cfg.setProperty(Property.TSERV_WALOG_MAX_SIZE, "1M");
@@ -1467,7 +1467,7 @@ public class ReplicationIT extends ConfigurableMacIT {
if (notFound) {
s = ReplicationTable.getScanner(conn);
for (Entry<Key,Value> content : s) {
- log.info(content.getKey().toStringNoTruncate() + " => " + content.getValue());
+ log.info(content.getKey().toStringNoTruncate() + " => " + ProtobufUtil.toString(Status.parseFrom(content.getValue().get())));
}
Assert.assertFalse("Did not find the work entry for the status entry", notFound);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4b68322f/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
index 1bd0eff..5cfc737 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
@@ -100,7 +100,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
cfg.setNumTservers(1);
- cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "3s");
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "10s");
cfg.setProperty(Property.TSERV_WALOG_MAX_SIZE, "2M");
cfg.setProperty(Property.GC_CYCLE_START, "1s");
cfg.setProperty(Property.GC_CYCLE_DELAY, "5s");