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 2014/04/22 20:05:56 UTC
[1/2] git commit: ACCUMULO-2717 kill the gc first,
increase the timeout for the ReadWriteITs
Repository: accumulo
Updated Branches:
refs/heads/master 0fca7dca7 -> 52565839e
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/master
Commit: 0b79ee830defb16a2b14731801c991e53023e34f
Parents: 6138a80
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Apr 22 14:03:09 2014 -0400
Committer: Eric C. Newton <er...@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
[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/52565839
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/52565839
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/52565839
Branch: refs/heads/master
Commit: 52565839e370110a9cdea51e1ca4392e11e377ee
Parents: 0fca7dc 0b79ee8
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Apr 22 14:04:19 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Apr 22 14:04:19 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/52565839/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------