Add fallback to cleanup perftest resources

naver · Sep 21, 2023 · e67db93 · e67db93
1 parent efc2b75
commit e67db93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ngrinder-controller/src/main/java/org/ngrinder/perftest/service/PerfTestRunnable.java b/ngrinder-controller/src/main/java/org/ngrinder/perftest/service/PerfTestRunnable.java
@@ -54,7 +54,8 @@
 import java.util.List;
 import java.util.Set;
 
-import static java.time.Instant.*;
+import static java.time.Instant.now;
+import static java.time.Instant.ofEpochMilli;
 import static java.time.temporal.ChronoUnit.MINUTES;
 import static java.util.Arrays.asList;
 import static java.util.Objects.requireNonNull;
@@ -229,6 +230,8 @@ public void doTest(final PerfTest perfTest) {
 			LOG.debug("Stack Trace is : ", ex);
 			doTerminate(perfTest, singleConsole, ex.getMessage());
 			notifyFinish(perfTest, StopReason.ERROR_WHILE_PREPARE);
+		} finally {
+			cleanUp(perfTest);
 		}
 	}
 
@@ -254,7 +257,7 @@ private void deleteCachedDistFiles(File distDir,
 	}
 
 	/**
-	 * Extract non cached distribution files for send to each agents.
+	 * Extract non cached distribution files for send to each agent.
 	 *
 	 * @param distFilesDigest					Required file's digest for currently running test.
 	 * @param agentCachedDistFilesDigestList    Digest of files in each agent cache directory.

diff --git a/ngrinder-core/src/main/java/net/grinder/SingleConsole.java b/ngrinder-core/src/main/java/net/grinder/SingleConsole.java
@@ -65,7 +65,6 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ForkJoinPool;
 
-
 import static java.util.Arrays.stream;
 import static java.util.Collections.synchronizedMap;
 import static org.ngrinder.common.util.CollectionUtils.*;
@@ -461,7 +460,7 @@ private void checkSafetyWithCacheState(final FileDistribution fileDistribution,
 
 	/**
 	 * Wait until the given size of agents are all connected and receive digest from there cached files.
-	 * It wait until 10 sec.
+	 * It waits until 10 sec.
 	 *
 	 * @param size size of agent.
 	 */