IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

allow scenario.stop to match regex

Browse Source
This commit is contained in:
Jonathan Shook 2021-11-19 17:37:12 -06:00
parent af5c516744
commit 5f5f873ea9
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ScenarioController.java
View File

@ -30,6 +30,7 @@ import org.apache.logging.log4j.Logger;
import java.security.InvalidParameterException;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@ -196,10 +197,19 @@ public class ScenarioController {
* activity to stop all threads, but keeps the thread objects handy for starting again. This can be useful
* for certain testing scenarios in which you want to stop some workloads and start others based on other conditions.
*
* @param alias The name of the activity that is already known to the scenario
* Alternately, you can provide one or more aliases in the same command, and all matching names will be stopped.
*
* @param spec The name of the activity that is already known to the scenario
*/
public synchronized void stop(String alias) {
stop(aliasToDef(alias));
public synchronized void stop(String spec) {
logger.debug("request->STOP '" + spec + "'");
List<String> aliases = Arrays.asList(spec.split("[,; ]"));
List<String> matched = aliases.stream().flatMap(a -> getMatchingAliases(a).stream()).collect(Collectors.toList());
for (String alias : matched) {
ActivityDef adef = aliasToDef(alias);
scenariologger.debug("STOP " + adef.getAlias());
stop(adef);
}
}
/**
@ -273,6 +283,22 @@ public class ScenarioController {
}
private List<String> getMatchingAliases(String pattern) {
Pattern matcher;
// If the pattern is an alphanumeric name, the require it to match as a fully-qualified literal
if (pattern.matches("[a-zA-Z_][a-zA-Z0-9_]*")) {
matcher = Pattern.compile("^" + pattern + "$");
} else { // It is not, so the user is wanting to do a flexible match
matcher = Pattern.compile(pattern);
}
List<String> matching = activityExecutors.keySet().stream()
.filter(a -> Pattern.matches(pattern, a))
.peek(p -> logger.debug("MATCH " + pattern + " -> " + p))
.collect(Collectors.toList());
return matching;
}
private ActivityExecutor getActivityExecutor(ActivityDef activityDef, boolean createIfMissing) {
synchronized (activityExecutors) {
ActivityExecutor executor = activityExecutors.get(activityDef.getAlias());
@ -356,11 +382,15 @@ public class ScenarioController {
*
* @param waitTimeMillis grace period during which an activity may cooperatively shut down
*/
public void forceStopScenario(int waitTimeMillis, boolean rethrow) {
public synchronized void forceStopScenario(int waitTimeMillis, boolean rethrow) {
logger.debug("Scenario force stopped.");
activityExecutors.values().forEach(a -> a.forceStopScenarioAndThrow(waitTimeMillis, rethrow));
}
// public synchronized void stopAll() {
// this.forceStopScenario(5000,false);
// }
/**
* Await completion of all running activities, but do not force shutdownActivity. This method is meant to provide
* the blocking point for calling logic. It waits.

8
engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
View File

@ -282,7 +282,7 @@ public class Scenario implements Callable<ScenarioResult> {
CompiledScript compiled = compilableEngine.compile(script);
logger.debug("-> invoking main scenario script (compiled)");
result = compiled.eval();
logger.debug("<- scenario completed (compiled)");
logger.debug("<- scenario script completed (compiled)");
} else {
if (scriptfile != null && !scriptfile.isEmpty()) {
@ -297,12 +297,12 @@ public class Scenario implements Callable<ScenarioResult> {
);
BufferedReader reader = Files.newBufferedReader(written);
scriptEngine.eval(reader);
logger.debug("<- scenario completed (interpreted " +
logger.debug("<- scenario control script completed (interpreted) " +
"from " + filename + ")");
} else {
logger.debug("-> invoking main scenario script (interpreted)");
result = scriptEngine.eval(script);
logger.debug("<- scenario completed (interpreted)");
logger.debug("<- scenario control script completed (interpreted)");
}
}
@ -324,7 +324,7 @@ public class Scenario implements Callable<ScenarioResult> {
}
}
long awaitCompletionTime = 86400 * 365 * 1000L;
logger.debug("Awaiting completion of scenario for " + awaitCompletionTime + " millis.");
logger.debug("Awaiting completion of scenario and activities for " + awaitCompletionTime + " millis.");
scenarioController.awaitCompletion(awaitCompletionTime);
//TODO: Ensure control flow covers controller shutdown in event of internal error.