Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 6138a80f0 -> 0b79ee830
ACCUMULO-2717 kill the gc first, increase the timeout for the ReadWriteITs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b79ee83 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0b79ee83 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0b79ee83 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 0b79ee830defb16a2b14731801c991e53023e34f Parents: 6138a80 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Apr 22 14:03:09 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Apr 22 14:03:51 2014 -0400 ---------------------------------------------------------------------- .../minicluster/impl/MiniAccumuloClusterImpl.java | 12 ++++++------ .../apache/accumulo/test/functional/ReadWriteIT.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b79ee83/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 6d16617..ce482f5 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 @@ -598,9 +598,9 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster { lw.flush(); } - if (zooKeeperProcess != null) { - zooKeeperProcess.destroy(); - zooKeeperProcess.waitFor(); + if (gcProcess != null) { + gcProcess.destroy(); + gcProcess.waitFor(); } if (masterProcess != null) { masterProcess.destroy(); @@ -614,9 +614,9 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster { } } } - if (gcProcess != null) { - gcProcess.destroy(); - gcProcess.waitFor(); + if (zooKeeperProcess != null) { + zooKeeperProcess.destroy(); + zooKeeperProcess.waitFor(); } zooKeeperProcess = null; http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b79ee83/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java index cb803f8..e4fe57c 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java @@ -61,7 +61,7 @@ public class ReadWriteIT extends ConfigurableMacIT { @Override protected int defaultTimeoutSeconds() { - return 2 * 60; + return 4 * 60; } @Test
