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

make stopping multiple activities more robust

Browse Source
This commit is contained in:
Jonathan Shook 2021-11-19 17:56:49 -06:00
parent 3e3d042113
commit 87c404bdb0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ package io.nosqlbench.engine.core.lifecycle;
import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.Activity;
import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityapi.core.ActivityType;
import io.nosqlbench.engine.api.activityapi.core.RunState;
import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityimpl.ActivityDef;
import io.nosqlbench.engine.api.activityimpl.ParameterMap; import io.nosqlbench.engine.api.activityimpl.ParameterMap;
import io.nosqlbench.engine.api.activityimpl.ProgressAndStateMeter; import io.nosqlbench.engine.api.activityimpl.ProgressAndStateMeter;
@ -177,6 +178,12 @@ public class ScenarioController {
if (activityExecutor == null) { if (activityExecutor == null) {
throw new RuntimeException("could not stop missing activity:" + activityDef); throw new RuntimeException("could not stop missing activity:" + activityDef);
} }
RunState runstate = activityExecutor.getActivity().getRunState();
if (runstate != RunState.Running) {
logger.warn("NOT stopping activity '" + activityExecutor.getActivity().getAlias() + "' because it is in state '" + runstate + "'");
return;
}
scenariologger.debug("STOP " + activityDef.getAlias()); scenariologger.debug("STOP " + activityDef.getAlias());
activityExecutor.stopActivity(); activityExecutor.stopActivity();
} }
@ -204,7 +211,10 @@ public class ScenarioController {
public synchronized void stop(String spec) { public synchronized void stop(String spec) {
logger.debug("request->STOP '" + spec + "'"); logger.debug("request->STOP '" + spec + "'");
List<String> aliases = Arrays.asList(spec.split("[,; ]")); List<String> aliases = Arrays.asList(spec.split("[,; ]"));
List<String> matched = aliases.stream().flatMap(a -> getMatchingAliases(a).stream()).collect(Collectors.toList()); List<String> matched = aliases.stream()
.map(String::trim)
.filter(s -> !s.isEmpty())
.flatMap(aspec -> getMatchingAliases(aspec).stream()).collect(Collectors.toList());
for (String alias : matched) { for (String alias : matched) {
ActivityDef adef = aliasToDef(alias); ActivityDef adef = aliasToDef(alias);
scenariologger.debug("STOP " + adef.getAlias()); scenariologger.debug("STOP " + adef.getAlias());
@ -286,7 +296,7 @@ public class ScenarioController {
private List<String> getMatchingAliases(String pattern) { private List<String> getMatchingAliases(String pattern) {
Pattern matcher; Pattern matcher;
// If the pattern is an alphanumeric name, the require it to match as a fully-qualified literal // 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_]*")) { if (pattern.matches("[a-zA-Z_][a-zA-Z0-9_.]*")) {
matcher = Pattern.compile("^" + pattern + "$"); matcher = Pattern.compile("^" + pattern + "$");
} else { // It is not, so the user is wanting to do a flexible match } else { // It is not, so the user is wanting to do a flexible match
matcher = Pattern.compile(pattern); matcher = Pattern.compile(pattern);