Merge pull request #63 from emc-mongoose/wait-op-finish-limit

Adding wait-op-finish-limit config
emc-mongoose · Feb 28, 2025 · a2741ef · a2741ef
2 parents 7bde8b7 + 8142653
commit a2741ef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/com/emc/mongoose/base/load/step/local/context/LoadStepContextImpl.java b/src/main/java/com/emc/mongoose/base/load/step/local/context/LoadStepContextImpl.java
@@ -63,6 +63,7 @@ public class LoadStepContextImpl<I extends Item, O extends Operation<I>> extends
 	private volatile Output<O> opsResultsOutput;
 	private volatile Output<O> opsMetricsOutput;
 	private final boolean waitOpFinishBeforeStop;
+	private final int waitOpFinishLimit;
 	private final boolean outputDuplicates;
 	private final boolean updateContents;
 	private final ThreadLocal<SplittableRandom> rand = ThreadLocal.withInitial(SplittableRandom::new);
@@ -110,6 +111,7 @@ public LoadStepContextImpl(
 		this.failCountLimit = configFailCount > 0 ? configFailCount : Long.MAX_VALUE;
 		this.failRateLimitFlag = failConfig.boolVal("rate");
 		this.waitOpFinishBeforeStop = opConfig.boolVal("wait-finish");
+		this.waitOpFinishLimit = opConfig.intVal("wait-limit");
 		this.outputDuplicates = opConfig.boolVal("output-duplicates");
 	}
 
@@ -515,14 +517,14 @@ protected final void doStop() throws IllegalStateException {
 		if (waitOpFinishBeforeStop) {
 			var i = 0;
 			var sleep = 1000;
-			for (; ((activeOpCount() != 0) && !Thread.currentThread().isInterrupted()) && i < 10; i++) {
+			for (; ((activeOpCount() != 0) && !Thread.currentThread().isInterrupted()) && ((i * sleep)/1000D < waitOpFinishLimit); i++) {
 				try {
 					Thread.sleep(sleep);
 				} catch (InterruptedException e) {
 					Loggers.MSG.debug("couldn't put context thread {} to sleep or was interrupted", this);
 				}
 			}
-			Loggers.MSG.info("{}: waited {}ms for ops to finish (active count = {})", id, i * sleep, activeOpCount());
+			Loggers.MSG.info("{}: waited {}s for ops to finish (active count = {})", id, i, activeOpCount());
 		}
 
 		driver.stop();

diff --git a/src/main/resources/config-schema.yaml b/src/main/resources/config-schema.yaml
@@ -63,6 +63,7 @@ load:
     type: string
     wait:
       finish: boolean
+      limit: int
 output:
   color: boolean
   metrics:

diff --git a/src/main/resources/config/defaults.yaml b/src/main/resources/config/defaults.yaml
@@ -53,6 +53,7 @@ load:
     type: create
     wait:
       finish: true
+      limit: 30
   service:
     threads: 0
   step:
@@ -92,7 +93,7 @@ run:
   node: false
   port: 9999
   scenario: null
-  version: 4.3.12
+  version: 4.3.13
 
 storage:
   auth: