Modify MiniAccumuloClusterControl.adminStopAll to stop sserver and co…

…mpactor The call to Manager.shutdown does not stop the ScanServers and Compactors.
dlmarion · Oct 27, 2023 · 1fc1c82 · 1fc1c82
1 parent 759b5d5
commit 1fc1c82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...cluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java b/...cluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
@@ -116,6 +116,8 @@ public void adminStopAll() throws IOException {
     if (p.exitValue() != 0) {
       throw new IOException("Failed to run `accumulo admin stopAll`");
     }
+    stopAllServers(ServerType.COMPACTOR);
+    stopAllServers(ServerType.SCAN_SERVER);
   }
 
   @Override

diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java
@@ -51,7 +51,6 @@
 import org.apache.hadoop.fs.RawLocalFileSystem;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -232,7 +231,6 @@ public void killedTabletServer2() throws Exception {
   }
 
   @Test
-  @Disabled // ELASTICITY_TODO
   public void killedTabletServerDuringShutdown() throws Exception {
     try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
       String tableName = getUniqueNames(1)[0];