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 2014/09/16 22:15:52 UTC
[2/4] git commit: ACCUMULO-3130 Try to make the test end faster.
ACCUMULO-3130 Try to make the test end faster.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2da2304a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2da2304a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2da2304a
Branch: refs/heads/master
Commit: 2da2304a684c067c4054b747958950e17893c057
Parents: 6e205e0
Author: Josh Elser <el...@apache.org>
Authored: Tue Sep 16 14:40:28 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Sep 16 16:15:34 2014 -0400
----------------------------------------------------------------------
.../accumulo/test/replication/MultiInstanceReplicationIT.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2da2304a/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 fcab23b..fb09706 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
@@ -253,6 +253,8 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT {
} catch (TimeoutException e) {
future.cancel(true);
Assert.fail("Drain did not finish within 60 seconds");
+ } finally {
+ executor.shutdownNow();
}
log.info("drain completed");
@@ -546,7 +548,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT {
peerCfg.setNumTservers(1);
peerCfg.setInstanceName("peer");
peerCfg.setProperty(Property.REPLICATION_NAME, "peer");
-
+
updatePeerConfigFromPrimary(getCluster().getConfig(), peerCfg);
MiniAccumuloClusterImpl peer1Cluster = peerCfg.build();