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

minor fixes on cqld4

Browse Source
This commit is contained in:
Jonathan Shook
2021-12-09 09:59:08 -06:00
parent 725b1473ef
commit 8955920a69
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java
View File

@@ -92,7 +92,7 @@ public class Cqld4Space {
} }
NBConfiguration sslCfg = SSLKsFactory.get().getConfigModel().extractConfig(cfg); NBConfiguration sslCfg = SSLKsFactory.get().getConfigModel().extract(cfg);
SSLContext ctx = SSLKsFactory.get().getContext(sslCfg); SSLContext ctx = SSLKsFactory.get().getContext(sslCfg);
if (ctx != null) { if (ctx != null) {

6
engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java
View File

@@ -228,6 +228,12 @@ public class ScenariosExecutor {
return name; return name;
} }
public synchronized void shutdownNow() {
if (!executor.isShutdown()) {
executor.shutdownNow();
}
}
private static class SubmittedScenario { private static class SubmittedScenario {
private final Scenario scenario; private final Scenario scenario;
private final Future<ScenarioResult> resultFuture; private final Future<ScenarioResult> resultFuture;

7
nbr/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java
View File

@@ -51,7 +51,7 @@ public class AsyncScriptIntegrationTests {
} }
String scenarioName = "scenario " + scriptname; String scenarioName = "scenario " + scriptname;
System.out.println("=".repeat(29) + " Running ASYNC integration test for: " + scenarioName); System.out.println("=".repeat(29) + " Running ASYNC integration test for: " + scenarioName);
ScenariosExecutor e = new ScenariosExecutor(AsyncScriptIntegrationTests.class.getSimpleName() + ":" + scriptname, 1); ScenariosExecutor executor = new ScenariosExecutor(AsyncScriptIntegrationTests.class.getSimpleName() + ":" + scriptname, 1);
Scenario s = new Scenario(scenarioName, Scenario.Engine.Graalvm,"stdout:300"); Scenario s = new Scenario(scenarioName, Scenario.Engine.Graalvm,"stdout:300");
s.addScenarioScriptParams(paramsMap); s.addScenarioScriptParams(paramsMap);
@@ -67,9 +67,10 @@ public class AsyncScriptIntegrationTests {
} }
s.addScriptText(script); s.addScriptText(script);
// s.addScriptText("load('classpath:scripts/async/" + scriptname + ".js');"); // s.addScriptText("load('classpath:scripts/async/" + scriptname + ".js');");
e.execute(s); executor.execute(s);
ScenariosResults scenariosResults = e.awaitAllResults(); ScenariosResults scenariosResults = executor.awaitAllResults();
ScenarioResult scenarioResult = scenariosResults.getOne(); ScenarioResult scenarioResult = scenariosResults.getOne();
executor.shutdownNow();
return scenarioResult; return scenarioResult;
} }