Improve cluster cleanup for in-memory integTest nodes

src/test/java/org/opensearch/security/test/SingleClusterTest.java

@@ -167,26 +167,28 @@ protected Client getClient() {
 
     @After
     public void tearDown() {
+        Exception firstFailure = null;
 
         if (remoteClusterInfo != null) {
             try {
                 remoteClusterHelper.stopCluster();
             } catch (Exception e) {
                 log.error("Failed to stop remote cluster {}.", remoteClusterInfo.clustername, e);
-                Assert.fail("Failed to stop remote cluster " + remoteClusterInfo.clustername + ".");
+                firstFailure = e;
             }
             remoteClusterInfo = null;
         }
 
-        if (clusterInfo != null) {
-            try {
-                clusterHelper.stopCluster();
-            } catch (Exception e) {
-                log.error("Failed to stop cluster {}.", clusterInfo.clustername, e);
-                Assert.fail("Failed to stop cluster " + clusterInfo.clustername + ".");
-            }
-            clusterInfo = null;
+        try {
+            clusterHelper.stopCluster();
+        } catch (Exception e) {
+            log.error("Failed to stop cluster.", e);
+            if (firstFailure == null) firstFailure = e;
         }
+        clusterInfo = null;
 
+        if (firstFailure != null) {
+            Assert.fail("Cluster cleanup failed: " + firstFailure.getMessage());
+        }
     }
 }

src/test/java/org/opensearch/security/test/helper/cluster/ClusterHelper.java

@@ -271,6 +271,7 @@ public void run() {
         latch.await();
 
         if (err.get() != null) {
+            closeAllNodes();
             throw new RuntimeException("Could not start all nodes " + err.get(), err.get());
         }
 
@@ -342,7 +343,7 @@ private void closeAllNodes() throws Exception {
     private static void closeNode(Node node) {
         try {
             node.close();
-            node.awaitClose(250, TimeUnit.MILLISECONDS);
+            node.awaitClose(5, TimeUnit.SECONDS);
         } catch (Throwable e) {
             // ignore
         }