(accumulo) branch elasticity updated: Modify MACC.adminStopAll to stop sserver and compactor (#3902)

[dlmarion]

This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/elasticity by this push:
     new 3564225e16 Modify MACC.adminStopAll to stop sserver and compactor 
(#3902)
3564225e16 is described below

commit 3564225e16175e98034d3ae22f158bf2a94fea04
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Oct 30 12:15:19 2023 -0400

    Modify MACC.adminStopAll to stop sserver and compactor (#3902)
    
    The call to Manager.shutdown does not stop the ScanServers and Compactors.
---
 .../org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java | 2 ++
 test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java   | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
 
b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
index de16f12e54..6d3b36026e 100644
--- 
a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
+++ 
b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
@@ -116,6 +116,8 @@ public class MiniAccumuloClusterControl implements 
ClusterControl {
     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
index 3ab2b96859..5e95262994 100644
--- 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.conf.Configuration;
 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 class RestartIT extends AccumuloClusterHarness {
   }
 
   @Test
-  @Disabled // ELASTICITY_TODO
   public void killedTabletServerDuringShutdown() throws Exception {
     try (AccumuloClient c = 
Accumulo.newClient().from(getClientProps()).build()) {
       String tableName = getUniqueNames(1)[0];