accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [01/50] [abbrv] accumulo git commit: ACCUMULO-3167 Let the cluster determine how to stop things
Date Wed, 26 Nov 2014 04:23:17 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6 4ac9085d4 -> 7ca9c2d32
  refs/heads/master 42c25faa7 -> 09a761b82


ACCUMULO-3167 Let the cluster determine how to stop things


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

Branch: refs/heads/master
Commit: b430f899eb61a65461c38692845ab1c5688639c7
Parents: 2796a02
Author: Josh Elser <elserj@apache.org>
Authored: Wed Nov 19 12:51:16 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Nov 24 18:08:17 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b430f899/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 5af9414..27d8119 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
@@ -144,9 +144,7 @@ public class RestartIT extends AccumuloClusterIT {
     TestIngest.ingest(c, OPTS, BWOPTS);
     ClusterControl control = getCluster().getClusterControl();
     // TODO implement a kill all too?
-    for (ServerType type : new ServerType[] {ServerType.TABLET_SERVER, ServerType.MASTER,
ServerType.MONITOR, ServerType.GARBAGE_COLLECTOR, ServerType.TRACER}) {
-      control.stopAllServers(type);
-    }
+    cluster.stop();
 
     ZooReader zreader = new ZooReader(c.getInstance().getZooKeepers(), c.getInstance().getZooKeepersSessionTimeOut());
     ZooCache zcache = new ZooCache(zreader, null);
@@ -158,6 +156,7 @@ public class RestartIT extends AccumuloClusterIT {
         Thread.sleep(1000);
       }
     } while (null != masterLockData);
+
     cluster.start();
     UtilWaitThread.sleep(5);
     control.stopAllServers(ServerType.MASTER);


Mime
View raw message