diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java index c203bacd1..196cc974a 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java @@ -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); if (ctx != null) { diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java index 17fa42914..92e0100dc 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/ScenariosExecutor.java @@ -228,6 +228,12 @@ public class ScenariosExecutor { return name; } + public synchronized void shutdownNow() { + if (!executor.isShutdown()) { + executor.shutdownNow(); + } + } + private static class SubmittedScenario { private final Scenario scenario; private final Future resultFuture; diff --git a/nbr/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java b/nbr/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java index 29687033a..4668e71a8 100644 --- a/nbr/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java +++ b/nbr/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java @@ -51,7 +51,7 @@ public class AsyncScriptIntegrationTests { } String scenarioName = "scenario " + scriptname; 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"); s.addScenarioScriptParams(paramsMap); @@ -67,9 +67,10 @@ public class AsyncScriptIntegrationTests { } s.addScriptText(script); // s.addScriptText("load('classpath:scripts/async/" + scriptname + ".js');"); - e.execute(s); - ScenariosResults scenariosResults = e.awaitAllResults(); + executor.execute(s); + ScenariosResults scenariosResults = executor.awaitAllResults(); ScenarioResult scenarioResult = scenariosResults.getOne(); + executor.shutdownNow(); return scenarioResult; }