Repository: accumulo Updated Branches: refs/heads/1.6 46ad8368e -> 29c6052d6 refs/heads/1.7 656282825 -> 94f4a19c0 refs/heads/master 18725dd6c -> 081eb1fac
ACCUMULO-4108 Increase zk timeout from 5s to 15s for ITs. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/29c6052d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29c6052d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/29c6052d Branch: refs/heads/1.6 Commit: 29c6052d64de0705729bf32136e44505e0c788cc Parents: 46ad836 Author: Josh Elser <els...@apache.org> Authored: Tue Jan 12 12:09:49 2016 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Jan 12 12:09:49 2016 -0500 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/test/Accumulo3010IT.java | 2 +- test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 2 +- .../org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java | 2 +- .../test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java | 2 +- .../java/org/apache/accumulo/test/functional/MasterFailoverIT.java | 2 +- .../test/java/org/apache/accumulo/test/functional/RestartIT.java | 2 +- .../java/org/apache/accumulo/test/functional/RestartStressIT.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/29c6052d/test/src/test/java/org/apache/accumulo/test/Accumulo3010IT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/Accumulo3010IT.java b/test/src/test/java/org/apache/accumulo/test/Accumulo3010IT.java index eff7251..8a0086b 100644 --- a/test/src/test/java/org/apache/accumulo/test/Accumulo3010IT.java +++ b/test/src/test/java/org/apache/accumulo/test/Accumulo3010IT.java @@ -48,7 +48,7 @@ public class Accumulo3010IT extends AccumuloClusterIT { @Override public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { cfg.setNumTservers(1); - cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s"); + cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s"); // file system supports recovery hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/29c6052d/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java index d55e427..323888a 100644 --- a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java @@ -56,7 +56,7 @@ public class ExistingMacIT extends ConfigurableMacIT { @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { - cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s"); + cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s"); // 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/29c6052d/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java index 72dabdf..f1372dc 100644 --- a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java +++ b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java @@ -59,7 +59,7 @@ public class MasterRepairsDualAssignmentIT extends ConfigurableMacIT { @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { - cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s"); + cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s"); cfg.setProperty(Property.MASTER_RECOVERY_DELAY, "5s"); // 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/29c6052d/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java index 3b25655..116092b 100644 --- a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java +++ b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java @@ -45,7 +45,7 @@ public class MultiTableRecoveryIT extends ConfigurableMacIT { @Override protected void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { - cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s"); + cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s"); // 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/29c6052d/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java index 7634f10..0c2631f 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java @@ -35,7 +35,7 @@ public class MasterFailoverIT extends AccumuloClusterIT { @Override public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { - cfg.setSiteConfig(Collections.singletonMap(Property.INSTANCE_ZK_TIMEOUT.getKey(), "5s")); + cfg.setSiteConfig(Collections.singletonMap(Property.INSTANCE_ZK_TIMEOUT.getKey(), "15s")); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/29c6052d/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 4e55ab4..b498412 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 @@ -67,7 +67,7 @@ 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.INSTANCE_ZK_TIMEOUT.getKey(), "15s"); props.put(Property.GC_CYCLE_DELAY.getKey(), "1s"); props.put(Property.GC_CYCLE_START.getKey(), "1s"); cfg.setSiteConfig(props); http://git-wip-us.apache.org/repos/asf/accumulo/blob/29c6052d/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java index b965420..c4b3afd 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java @@ -55,7 +55,7 @@ public class RestartStressIT extends AccumuloClusterIT { opts.put(Property.TSERV_MAXMEM.getKey(), "100K"); opts.put(Property.TSERV_MAJC_DELAY.getKey(), "100ms"); opts.put(Property.TSERV_WALOG_MAX_SIZE.getKey(), "1M"); - opts.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "5s"); + opts.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "15s"); opts.put(Property.MASTER_RECOVERY_DELAY.getKey(), "1s"); cfg.setSiteConfig(opts); cfg.useMiniDFS(true);
