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 2015/02/25 19:43:39 UTC
accumulo git commit: ACCUMULO-3625 make the zookeeper timeout smaller
if restarting processes
Repository: accumulo
Updated Branches:
refs/heads/master 77cd4cc7d -> 668f81584
ACCUMULO-3625 make the zookeeper timeout smaller if restarting processes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/668f8158
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/668f8158
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/668f8158
Branch: refs/heads/master
Commit: 668f81584fa00e2c99b359e6bfccf944893e1974
Parents: 77cd4cc
Author: Eric C. Newton <er...@gmail.com>
Authored: Wed Feb 25 13:43:25 2015 -0500
Committer: Eric C. Newton <er...@gmail.com>
Committed: Wed Feb 25 13:43:25 2015 -0500
----------------------------------------------------------------------
.../accumulo/test/VerifySerialRecoveryIT.java | 1 +
.../functional/BalanceAfterCommsFailureIT.java | 3 +--
.../accumulo/test/functional/BinaryStressIT.java | 8 +++-----
.../test/functional/BulkSplitOptimizationIT.java | 4 +---
.../accumulo/test/functional/CleanTmpIT.java | 6 +-----
.../accumulo/test/functional/CompactionIT.java | 13 +++++++------
.../test/functional/GarbageCollectorIT.java | 17 +++++++----------
.../test/functional/HalfDeadTServerIT.java | 7 ++-----
.../apache/accumulo/test/functional/RestartIT.java | 10 +++-------
.../test/functional/SimpleBalancerFairnessIT.java | 8 ++------
.../apache/accumulo/test/functional/SplitIT.java | 7 ++-----
.../accumulo/test/functional/WriteAheadLogIT.java | 17 ++++++-----------
.../replication/MultiInstanceReplicationIT.java | 1 +
.../accumulo/test/replication/ReplicationIT.java | 1 +
.../UnorderedWorkAssignerReplicationIT.java | 1 +
15 files changed, 39 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
index d1d4681..672709b 100644
--- a/test/src/test/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
@@ -48,6 +48,7 @@ public class VerifySerialRecoveryIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
cfg.setNumTservers(1);
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "3s");
cfg.setProperty(Property.TSERV_ASSIGNMENT_MAXCONCURRENT, "20");
hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
index aabacc6..a2a43e4 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertTrue;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -53,7 +52,7 @@ public class BalanceAfterCommsFailureIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
- cfg.setSiteConfig(Collections.singletonMap(Property.GENERAL_RPC_TIMEOUT.getKey(), "2s"));
+ cfg.setProperty(Property.GENERAL_RPC_TIMEOUT, "2s");
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java
index 5a41d32..5084e45 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.test.functional;
import static org.junit.Assert.assertTrue;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
@@ -51,10 +50,9 @@ public class BinaryStressIT extends AccumuloClusterIT {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
- Map<String,String> siteConfig = new HashMap<String,String>();
- siteConfig.put(Property.TSERV_MAXMEM.getKey(), "50K");
- siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "0");
- cfg.setSiteConfig(siteConfig);
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "3s");
+ cfg.setProperty(Property.TSERV_MAXMEM, "50K");
+ cfg.setProperty(Property.TSERV_MAJC_DELAY, "0");
}
private String majcDelay, maxMem;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
index 0fdd7da..e4fdfd8 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
@@ -18,8 +18,6 @@ package org.apache.accumulo.test.functional;
import static com.google.common.base.Charsets.UTF_8;
-import java.util.Collections;
-
import org.apache.accumulo.core.cli.ClientOpts.Password;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.Connector;
@@ -47,7 +45,7 @@ public class BulkSplitOptimizationIT extends AccumuloClusterIT {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
- cfg.setSiteConfig(Collections.singletonMap(Property.TSERV_MAJC_DELAY.getKey(), "1s"));
+ cfg.setProperty(Property.TSERV_MAJC_DELAY, "1s");
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
index 1387983..4e6799f 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
@@ -21,8 +21,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Map.Entry;
import org.apache.accumulo.core.client.BatchWriter;
@@ -54,9 +52,7 @@ public class CleanTmpIT extends AccumuloClusterIT {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
- Map<String,String> props = new HashMap<String,String>();
- props.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "3s");
- cfg.setSiteConfig(props);
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "3s");
cfg.setNumTservers(1);
cfg.useMiniDFS(true);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
index ab26a44..80792f6 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -40,6 +39,7 @@ import org.apache.accumulo.test.VerifyIngest;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.RawLocalFileSystem;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -51,11 +51,12 @@ public class CompactionIT extends AccumuloClusterIT {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
- Map<String,String> map = new HashMap<String,String>();
- map.put(Property.TSERV_MAJC_THREAD_MAXOPEN.getKey(), "4");
- map.put(Property.TSERV_MAJC_DELAY.getKey(), "1");
- map.put(Property.TSERV_MAJC_MAXCONCURRENT.getKey(), "1");
- cfg.setSiteConfig(map);
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s");
+ cfg.setProperty(Property.TSERV_MAJC_THREAD_MAXOPEN, "4");
+ cfg.setProperty(Property.TSERV_MAJC_DELAY, "1");
+ cfg.setProperty(Property.TSERV_MAJC_MAXCONCURRENT, "1");
+ // use raw local file system so walogs sync and flush will work
+ hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index 666e395..2efde6f 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -21,10 +21,8 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Map.Entry;
import org.apache.accumulo.core.Constants;
@@ -80,14 +78,13 @@ public class GarbageCollectorIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
- Map<String,String> settings = new HashMap<String,String>();
- settings.put(Property.INSTANCE_SECRET.getKey(), OUR_SECRET);
- settings.put(Property.GC_CYCLE_START.getKey(), "1");
- settings.put(Property.GC_CYCLE_DELAY.getKey(), "1");
- settings.put(Property.GC_PORT.getKey(), "0");
- settings.put(Property.TSERV_MAXMEM.getKey(), "5K");
- settings.put(Property.TSERV_MAJC_DELAY.getKey(), "1");
- cfg.setSiteConfig(settings);
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s");
+ cfg.setProperty(Property.INSTANCE_SECRET, OUR_SECRET);
+ cfg.setProperty(Property.GC_CYCLE_START, "1");
+ cfg.setProperty(Property.GC_CYCLE_DELAY, "1");
+ cfg.setProperty(Property.GC_PORT, "0");
+ cfg.setProperty(Property.TSERV_MAXMEM, "5K");
+ cfg.setProperty(Property.TSERV_MAJC_DELAY, "1");
// use raw local file system so walogs sync and flush will work
hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java b/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
index a7b65cd..ec0f760 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
@@ -27,7 +27,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Map;
import org.apache.accumulo.core.cli.ScannerOpts;
@@ -49,10 +48,8 @@ public class HalfDeadTServerIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
cfg.setNumTservers(1);
- Map<String,String> siteConfig = new HashMap<String,String>();
- siteConfig.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "15s");
- siteConfig.put(Property.GENERAL_RPC_TIMEOUT.getKey(), "5s");
- cfg.setSiteConfig(siteConfig);
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s");
+ cfg.setProperty(Property.GENERAL_RPC_TIMEOUT, "5s");
cfg.useMiniDFS(true);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
index d0e32a2..1aa5ad7 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
@@ -19,8 +19,6 @@ package org.apache.accumulo.test.functional;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -66,11 +64,9 @@ public class RestartIT extends AccumuloClusterIT {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
- Map<String,String> props = new HashMap<String,String>();
- props.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "5s");
- props.put(Property.GC_CYCLE_DELAY.getKey(), "1s");
- props.put(Property.GC_CYCLE_START.getKey(), "1s");
- cfg.setSiteConfig(props);
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s");
+ cfg.setProperty(Property.GC_CYCLE_DELAY, "1s");
+ cfg.setProperty(Property.GC_CYCLE_START, "1s");
cfg.useMiniDFS(true);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
index a458ec2..5c1ad8c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
@@ -20,9 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.TreeSet;
import org.apache.accumulo.core.cli.BatchWriterOpts;
@@ -50,10 +48,8 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
- Map<String,String> siteConfig = new HashMap<String,String>();
- siteConfig.put(Property.TSERV_MAXMEM.getKey(), "10K");
- siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "0");
- cfg.setSiteConfig(siteConfig);
+ cfg.setProperty(Property.TSERV_MAXMEM, "10K");
+ cfg.setProperty(Property.TSERV_MAJC_DELAY, "0");
cfg.setMemory(ServerType.TABLET_SERVER, cfg.getMemory(ServerType.TABLET_SERVER) * 3, MemoryUnit.BYTE);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java
index 22c509b..69b0ea1 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.test.functional;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -59,10 +58,8 @@ public class SplitIT extends AccumuloClusterIT {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
- Map<String,String> siteConfig = new HashMap<String,String>();
- siteConfig.put(Property.TSERV_MAXMEM.getKey(), "5K");
- siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "100ms");
- cfg.setSiteConfig(siteConfig);
+ cfg.setProperty(Property.TSERV_MAXMEM, "5K");
+ cfg.setProperty(Property.TSERV_MAJC_DELAY, "100ms");
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
index 008476f..d375f01 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
@@ -16,9 +16,6 @@
*/
package org.apache.accumulo.test.functional;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.Connector;
@@ -35,14 +32,12 @@ public class WriteAheadLogIT extends AccumuloClusterIT {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
- Map<String,String> siteConfig = new HashMap<String,String>();
- siteConfig.put(Property.TSERV_WALOG_MAX_SIZE.getKey(), "2M");
- siteConfig.put(Property.GC_CYCLE_DELAY.getKey(), "1");
- siteConfig.put(Property.GC_CYCLE_START.getKey(), "1");
- siteConfig.put(Property.MASTER_RECOVERY_DELAY.getKey(), "1s");
- siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "1");
- siteConfig.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "4s");
- cfg.setSiteConfig(siteConfig);
+ cfg.setProperty(Property.TSERV_WALOG_MAX_SIZE, "2M");
+ cfg.setProperty(Property.GC_CYCLE_DELAY, "1");
+ cfg.setProperty(Property.GC_CYCLE_START, "1");
+ cfg.setProperty(Property.MASTER_RECOVERY_DELAY, "1s");
+ cfg.setProperty(Property.TSERV_MAJC_DELAY, "1");
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "4s");
cfg.useMiniDFS(true);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
index cc9a4e2..125286f 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
@@ -94,6 +94,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT {
@Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
cfg.setNumTservers(1);
+ cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "3s");
cfg.setProperty(Property.TSERV_WALOG_MAX_SIZE, "2M");
cfg.setProperty(Property.GC_CYCLE_START, "1s");
cfg.setProperty(Property.GC_CYCLE_DELAY, "5s");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/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 491f5c5..185a33a 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,6 +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.MASTER_REPLICATION_SCAN_INTERVAL, "1s");
cfg.setProperty(Property.REPLICATION_WORK_ASSIGNMENT_SLEEP, "1s");
cfg.setProperty(Property.TSERV_WALOG_MAX_SIZE, "1M");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/668f8158/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 1c8c031..1bd0eff 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,6 +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.TSERV_WALOG_MAX_SIZE, "2M");
cfg.setProperty(Property.GC_CYCLE_START, "1s");
cfg.setProperty(Property.GC_CYCLE_DELAY, "5s");