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

basic component lifetimes working

Browse Source
This commit is contained in:
Jonathan Shook
2023-09-29 21:51:46 -05:00
parent 7f960778b4
commit b0e984c55f
24 changed files with 217 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
View File

@@ -74,7 +74,7 @@ import java.util.ServiceLoader.Provider;
import java.util.function.Function;
import java.util.stream.Collectors;
public class NBCLI extends NBBaseComponent implements Function<String[], Integer> {
public class NBCLI implements Function<String[], Integer>, NBLabeledElement {
private static Logger logger;
private static final LoggerConfig loggerConfig;
@@ -88,17 +88,14 @@ public class NBCLI extends NBBaseComponent implements Function<String[], Integer
}
private final String commandName;
private NBLabels labels;
private String sessionName;
private String sessionCode;
private long sessionTime;
private NBLabels extraLabels = NBLabels.forKV();
private NBLabels labels = NBLabels.forKV("appname","nosqlbench");
private ClientSystemMetricChecker clientMetricChecker;
public NBCLI(final String commandName) {
super(null, NBLabels.forKV("appname","nosqlbench"));
this.commandName = commandName;
}
@@ -166,14 +163,9 @@ public class NBCLI extends NBBaseComponent implements Function<String[], Integer
NBCLI.loggerConfig.setConsoleLevel(NBLogLevel.ERROR);
this.sessionTime = System.currentTimeMillis();
final NBCLIOptions globalOptions = new NBCLIOptions(args, Mode.ParseGlobalsOnly);
this.extraLabels=globalOptions.getLabelMap();
this.labels=globalOptions.getLabelMap();
this.sessionCode = SystemId.genSessionCode(sessionTime);
this.sessionName = SessionNamer.format(globalOptions.getSessionName(), sessionTime).replaceAll("SESSIONCODE", sessionCode);
this.labels = NBLabels.forKV()
.and("appname", "nosqlbench")
.and("node", SystemId.getNodeId())
.and(globalOptions.getLabelMap());
NBCLI.loggerConfig
.setSessionName(sessionName)
@@ -439,7 +431,7 @@ public class NBCLI extends NBBaseComponent implements Function<String[], Integer
* marshal and transform it for any scenario invocations directly.
*/
NBSession session = new NBSession(
this,
new NBBaseComponent(null),
sessionName,
options.getProgressSpec(),
options.getReportSummaryTo(),
@@ -595,7 +587,7 @@ public class NBCLI extends NBBaseComponent implements Function<String[], Integer
@Override
public NBLabels getLabels() {
return (extraLabels==null) ? super.getLabels() : super.getLabels().and(extraLabels);
return labels;
}
}

4
engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
View File

@@ -21,6 +21,7 @@ import io.nosqlbench.api.errors.BasicError;
import io.nosqlbench.api.labels.NBLabelSpec;
import io.nosqlbench.api.labels.NBLabels;
import io.nosqlbench.api.logging.NBLogLevel;
import io.nosqlbench.api.metadata.SystemId;
import io.nosqlbench.api.system.NBStatePath;
import io.nosqlbench.engine.api.metrics.IndicatorMode;
import io.nosqlbench.engine.cli.Cmd.CmdType;
@@ -133,7 +134,8 @@ public class NBCLIOptions {
// private static final String DEFAULT_CONSOLE_LOGGING_PATTERN = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n";
private NBLabels labels = NBLabels.forKV();
private NBLabels labels = NBLabels.forKV("appname", "nosqlbench")
.and("node",SystemId.getNodeId());
private final List<Cmd> cmdList = new ArrayList<>();
private int logsMax;
private boolean wantsVersionShort;