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

SCDryRunScenarioTest running like js analog now

Browse Source
This commit is contained in:
Jonathan Shook
2023-10-04 00:51:16 -05:00
parent 65db41b22a
commit 835c74597a
14 changed files with 179 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBDefaultSceneFixtures.java
View File

@@ -21,10 +21,7 @@ import io.nosqlbench.components.NBComponent;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.Extensions;
import io.nosqlbench.engine.core.lifecycle.session.NBSession;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.io.*;
/**
* <P>An NBSceneFixtures instance represents the runtime fixtures needed to run a specific
@@ -66,12 +63,12 @@ public class NBDefaultSceneFixtures implements NBSceneFixtures {
*/
private Extensions extensions;
private Writer out;
private Writer err;
private PrintWriter out;
private PrintWriter err;
private Reader in;
public NBDefaultSceneFixtures(ScriptParams params, NBComponent parent, ActivitiesController controller, Extensions extensions, Writer out, Writer err, Reader in) {
public NBDefaultSceneFixtures(ScriptParams params, NBComponent parent, ActivitiesController controller, Extensions extensions, PrintWriter out, PrintWriter err, Reader in) {
this.params = params;
this.session = parent;
this.controller = controller;
@@ -89,8 +86,8 @@ public class NBDefaultSceneFixtures implements NBSceneFixtures {
),
new ActivitiesController(),
Extensions.ofNone(),
new OutputStreamWriter(System.out),
new OutputStreamWriter(System.err),
new PrintWriter(System.out),
new PrintWriter(System.err),
new InputStreamReader(System.in)
);
}
@@ -116,12 +113,12 @@ public class NBDefaultSceneFixtures implements NBSceneFixtures {
}
@Override
public Writer out() {
public PrintWriter out() {
return out;
}
@Override
public Writer err() {
public PrintWriter err() {
return err;
}

3
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBSceneBuffer.java
View File

@@ -21,6 +21,7 @@ import io.nosqlbench.engine.api.scripting.DiagReader;
import io.nosqlbench.engine.api.scripting.DiagWriter;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.Extensions;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
import java.util.ArrayList;
@@ -63,7 +64,7 @@ public class NBSceneBuffer implements NBSceneFixtures {
}
@Override
public Writer out() {
public PrintWriter out() {
return stdoutBuffer;
}

3
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBSceneFixtures.java
View File

@@ -19,6 +19,7 @@ package io.nosqlbench.engine.core.lifecycle.scenario.context;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.Extensions;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
@@ -31,7 +32,7 @@ public interface NBSceneFixtures {
Extensions extensions();
Writer out();
PrintWriter out();
Writer err();

34
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/direct/NBBaseScenario.java Normal file
View File

@@ -0,0 +1,34 @@
/*
* Copyright (c) 2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.nosqlbench.engine.core.lifecycle.scenario.direct;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.engine.core.lifecycle.scenario.context.NBSceneFixtures;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBScenario;
import java.util.Map;
public abstract class NBBaseScenario extends NBScenario {
public NBBaseScenario(NBComponent parentComponent, String scenarioName, Map<String, String> params, String progressInterval) {
super(parentComponent, scenarioName, params, progressInterval);
}
@Override
protected void runScenario(NBSceneFixtures sctx) {
}
}

8
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBScenario.java
View File

@@ -26,7 +26,7 @@ import io.nosqlbench.components.NBComponentErrorHandler;
import io.nosqlbench.engine.core.annotation.Annotators;
import io.nosqlbench.engine.core.lifecycle.activity.ActivitiesProgressIndicator;
import io.nosqlbench.engine.core.lifecycle.scenario.context.ActivitiesController;
import io.nosqlbench.engine.core.lifecycle.scenario.context.NBSceneBuffer;
import io.nosqlbench.engine.core.lifecycle.scenario.context.NBSceneFixtures;
import io.nosqlbench.engine.core.lifecycle.scenario.script.NBScriptedScenario;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -44,7 +44,7 @@ import java.util.function.Function;
* </OL>
*/
public abstract class NBScenario extends NBBaseComponent
implements Function<NBSceneBuffer, ScenarioResult>, NBComponentErrorHandler {
implements Function<NBSceneFixtures, ScenarioResult>, NBComponentErrorHandler {
private final String scenarioName;
private final Map<String, String> params;
@@ -120,7 +120,7 @@ public abstract class NBScenario extends NBBaseComponent
* @return
*/
@Override
public final ScenarioResult apply(NBSceneBuffer sctx) {
public final ScenarioResult apply(NBSceneFixtures sctx) {
this.scenarioShutdownHook = new ScenarioShutdownHook(this);
Runtime.getRuntime().addShutdownHook(this.scenarioShutdownHook);
@@ -177,7 +177,7 @@ public abstract class NBScenario extends NBBaseComponent
error = new RuntimeException("in thread " + t.getName() + ", " + e, e);
}
protected abstract void runScenario(NBSceneBuffer sctx);
protected abstract void runScenario(NBSceneFixtures sctx);
public void finish() {
this.logger.debug("finishing scenario");

6
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ScenarioResult.java
View File

@@ -50,4 +50,10 @@ public class ScenarioResult {
public String getIOLog() {
return iolog;
}
@Override
public String toString() {
return ((error!=null)? "ERROR:" + error.toString() : "") +
getIOLog();
}
}

8
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ScenariosExecutor.java
View File

@@ -31,7 +31,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
@@ -64,8 +64,8 @@ public class ScenariosExecutor extends NBBaseComponent {
this.getParent(),
scenario.getActivitiesController(),
loadExtensions(),
new OutputStreamWriter(System.out),
new OutputStreamWriter(System.err),
new PrintWriter(System.out),
new PrintWriter(System.err),
new InputStreamReader(System.in)
);
NBSceneBuffer bufferedContext = new NBSceneBuffer(basecontext);
@@ -177,7 +177,7 @@ public class ScenariosExecutor extends NBBaseComponent {
} catch (Exception e) {
long now = System.currentTimeMillis();
logger.debug("creating exceptional scenario result from getAsyncResultStatus");
oResult = Optional.of(new ScenarioResult(now, now, "errored output", e));
oResult = Optional.of(new ScenarioResult(now, now, "errored output" + e.getMessage(), e));
}
}

6
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ScenariosResults.java
View File

@@ -23,6 +23,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
public class ScenariosResults {
@@ -84,4 +85,9 @@ public class ScenariosResults {
public int getSize() {
return this.scenarioResultMap.size();
}
@Override
public String toString() {
return scenarioResultMap.values().stream().map(Object::toString).collect(Collectors.joining("\n"));
}
}

6
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/BufferedScriptContext.java
View File

@@ -16,16 +16,16 @@
package io.nosqlbench.engine.core.lifecycle.scenario.script;
import io.nosqlbench.engine.core.lifecycle.scenario.context.NBSceneBuffer;
import io.nosqlbench.engine.core.lifecycle.scenario.context.NBSceneFixtures;
import javax.script.SimpleScriptContext;
import java.io.Reader;
import java.io.Writer;
public class BufferedScriptContext extends SimpleScriptContext {
private final NBSceneBuffer fixtures;
private final NBSceneFixtures fixtures;
public BufferedScriptContext(NBSceneBuffer fixtures) {
public BufferedScriptContext(NBSceneFixtures fixtures) {
this.fixtures = fixtures;
}

6
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/NBScriptedScenario.java
View File

@@ -22,7 +22,7 @@ import io.nosqlbench.api.labels.NBLabeledElement;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.engine.core.lifecycle.ExecutionMetricsResult;
import io.nosqlbench.engine.core.lifecycle.activity.ActivitiesProgressIndicator;
import io.nosqlbench.engine.core.lifecycle.scenario.context.NBSceneBuffer;
import io.nosqlbench.engine.core.lifecycle.scenario.context.NBSceneFixtures;
import io.nosqlbench.engine.core.lifecycle.scenario.context.ScriptParams;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBScenario;
import org.graalvm.polyglot.Context;
@@ -119,7 +119,7 @@ public class NBScriptedScenario extends NBScenario {
return this;
}
private void initializeScriptContext(NBSceneBuffer fixtures) {
private void initializeScriptContext(NBSceneFixtures fixtures) {
BufferedScriptContext ctx = new BufferedScriptContext(fixtures);
this.scriptEngine.setContext(ctx);
}
@@ -164,7 +164,7 @@ public class NBScriptedScenario extends NBScenario {
//
}
protected synchronized void runScenario(NBSceneBuffer context) {
protected synchronized void runScenario(NBSceneFixtures context) {
if (null == result) {
try {
this.logger.debug("Initializing scripting engine for {}.", scenarioName);

17
nb-api/src/main/java/io/nosqlbench/engine/api/scripting/DiagWriter.java
View File

@@ -17,14 +17,14 @@
package io.nosqlbench.engine.api.scripting;
import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
public class DiagWriter extends Writer {
public class DiagWriter extends PrintWriter {
Writer wrapped;
private final String prefix;
@@ -35,12 +35,13 @@ public class DiagWriter extends Writer {
private final DateTimeFormatter tsformat = DateTimeFormatter.ISO_DATE_TIME;
public DiagWriter(Writer wrapped, String prefix) {
super(wrapped);
this.wrapped = wrapped;
this.prefix = prefix;
}
@Override
public void write(char[] cbuf, int off, int len) throws IOException {
public void write(char[] cbuf, int off, int len) {
String tsprefix = LocalDateTime.now().format(tsformat);
buffer.write(cbuf, off, len);
@@ -63,19 +64,19 @@ public class DiagWriter extends Writer {
}
wrapped.write(cbuf, off, len);
super.write(cbuf, off, len);
}
@Override
public void flush() throws IOException {
public void flush() {
buffer.flush();
wrapped.flush();
super.flush();
}
@Override
public void close() throws IOException {
public void close() {
buffer.close();
wrapped.close();
super.close();
}
public List<String> getTimedLog() {

30
nbr-examples/src/test/java/io/nosqlbench/nbr/DirectRuntimeScenarioTests.java
View File

@@ -16,19 +16,23 @@
package io.nosqlbench.nbr;
import io.nosqlbench.api.config.standard.TestComponent;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.ScenariosExecutor;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.ScenariosResults;
import io.nosqlbench.nbr.examples.SCDryRunScenarioTest;
import org.junit.jupiter.api.Test;
import java.util.Map;
public class DirectRuntimeScenarioTests {
// @Test
// public void testDirect() {
// TestComponent testC = new TestComponent("testroot", "testroot");
// new NBScriptedScenario(
// "testname",
// "console:1m",
// null,
// Path.of("native-logs"),
// null,
// testC,
// NBScriptedScenario.Invocation.EXECUTE_SCRIPT
// );
// }
@Test
public void testDirect() {
TestComponent testC = new TestComponent("testroot", "testroot");
SCDryRunScenarioTest sc1 = new SCDryRunScenarioTest(TestComponent.EMPTY_COMPONENT, "test", Map.of(), "console:1s");
ScenariosExecutor executor = new ScenariosExecutor(TestComponent.EMPTY_COMPONENT, "test", 1);
executor.execute(sc1);
ScenariosResults results = executor.awaitAllResults();
System.out.println(results);
}
}

80
nbr-examples/src/test/java/io/nosqlbench/nbr/examples/SCDryRunScenarioTest.java Normal file
View File

@@ -0,0 +1,80 @@
/*
* Copyright (c) 2023 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.nosqlbench.nbr.examples;
import io.nosqlbench.api.engine.activityimpl.ActivityDef;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.engine.core.lifecycle.scenario.context.NBSceneFixtures;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBScenario;
import java.util.Map;
public class SCDryRunScenarioTest extends NBScenario {
public SCDryRunScenarioTest(NBComponent parentComponent, String scenarioName, Map<String, String> params, String progressInterval) {
super(parentComponent, scenarioName, params, progressInterval);
}
/**
* print('starting activity activity_error');
* scenario.start(activitydef1);
* scenario.waitMillis(2000);
* activities.activity_error.threads = "unparsable";
* scenario.awaitActivity("activity_error");
* print("awaited activity");
*/
@Override
protected void runScenario(NBSceneFixtures shell) {
/**
* activitydef1 = {
* "alias": "activity_error",
* "driver": "diag",
* "cycles": "0..1500000",
* "threads": "1",
* "targetrate": "10",
* "op": "log: modulo=1"
* };
*/
var activitydef1 = Map.of("alias", "activity_error",
"driver", "diag",
"cycles", "0..1500000",
"threads", "1",
"targetrate", "10",
"op", "log: modulo=1");
// print('starting activity activity_error');
shell.out().write("starting activity activity_error");
// scenario.start(activitydef1);
shell.controller().start(activitydef1);
// scenario.waitMillis(2000);
shell.controller().waitMillis(2000);
// activities.activity_error.threads = "unparsable";
ActivityDef def = shell.controller().getActivityDef("activity_error");
def.getParams().set("threads","unparsable");
// scenario.awaitActivity("activity_error");
shell.controller().awaitActivity("activity_error", Long.MAX_VALUE);
// print("awaited activity");
shell.out().println("awaited activity");
}
}

2
pom.xml
View File

@@ -85,7 +85,7 @@
<module>nb5-proof</module>
<module>nb5</module>
<module>nbr</module>
<!-- <module>nbr-examples</module>-->
<module>nbr-examples</module>
<module>nb-api</module>
<module>nb-annotations</module>
<module>nb-spectest</module>