ARTEMIS-4413 Improve reliability of CheckTest.testNodeCheckTopology

I have also made some other quick changes to make testing here easier.
apache · Sep 1, 2023 · 47a3ee5 · 47a3ee5
1 parent 78a3e66
commit 47a3ee5
Show file tree

Hide file tree

Showing 8 changed files with 384 additions and 425 deletions.
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/check/CheckAbstract.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/check/CheckAbstract.java
@@ -61,7 +61,6 @@ public void setTimeout(int timeout) {
    @Override
    public Object execute(ActionContext context) throws Exception {
       super.execute(context);
-
       ExecutorService executor = Executors.newFixedThreadPool(1);
 
       Future<Integer> checkTask = executor.submit(() -> {
@@ -141,7 +140,7 @@ public Object execute(ActionContext context) throws Exception {
       } catch (TimeoutException e) {
          fail("timeout");
       } finally {
-         executor.shutdown();
+         executor.shutdownNow();
       }
 
       return 0;