accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject git commit: ACCUMULO-1685 updated test case to catch error
Date Thu, 05 Sep 2013 16:12:52 GMT
Updated Branches:
  refs/heads/master ff02d20db -> 2d6499c44


ACCUMULO-1685 updated test case to catch error


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d6499c4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d6499c4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2d6499c4

Branch: refs/heads/master
Commit: 2d6499c44026ebf04cd05bffde2dbbbffa11fc55
Parents: ff02d20
Author: Eric Newton <ecn@apache.org>
Authored: Thu Sep 5 12:13:03 2013 -0400
Committer: Eric Newton <ecn@apache.org>
Committed: Thu Sep 5 12:13:03 2013 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/test/functional/RestartIT.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2d6499c4/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 218a475..1567d7b 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
@@ -20,8 +20,9 @@ import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.accumulo.core.cli.BatchWriterOpts;
@@ -33,6 +34,7 @@ import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.minicluster.MiniAccumuloConfig;
 import org.apache.accumulo.minicluster.ProcessReference;
 import org.apache.accumulo.minicluster.ServerType;
+import org.apache.accumulo.server.gc.SimpleGarbageCollector;
 import org.apache.accumulo.server.util.Admin;
 import org.apache.accumulo.test.TestIngest;
 import org.apache.accumulo.test.VerifyIngest;
@@ -41,7 +43,11 @@ import org.junit.Test;
 public class RestartIT extends ConfigurableMacIT {
   @Override
   public void configure(MiniAccumuloConfig cfg) {
-    cfg.setSiteConfig(Collections.singletonMap(Property.INSTANCE_ZK_TIMEOUT.getKey(), "5s"));
+    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.useMiniDFS(true);
   }
 
@@ -121,6 +127,9 @@ public class RestartIT extends ConfigurableMacIT {
   public void killedTabletServer2() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("t");
+    Process gc = cluster.exec(SimpleGarbageCollector.class);
+    UtilWaitThread.sleep(5 * 1000);
+    gc.destroy();
     List<ProcessReference> procs = new ArrayList<ProcessReference>(cluster.getProcesses().get(ServerType.TABLET_SERVER));
     for (ProcessReference tserver : procs) {
       cluster.killProcess(ServerType.TABLET_SERVER, tserver);


Mime
View raw message