activityDefMap) {
ActivityDef ad = new ActivityDef(new ParameterMap(activityDefMap));
Activity started = start(ad);
- awaitAllThreadsOnline(started,30000L);
return started;
}
@@ -120,9 +117,7 @@ public class ContainerActivitiesController extends NBBaseComponent {
* @param activityDef A definition for an activity to run
*/
public synchronized void run(ActivityDef activityDef, long timeoutMs) {
-
- doStartActivity(activityDef);
- awaitActivity(activityDef, timeoutMs);
+ throw new RuntimeException("implement me");
}
public synchronized void run(int timeout, String activityDefString) {
@@ -176,26 +171,12 @@ public class ContainerActivitiesController extends NBBaseComponent {
runtimeInfo.stopActivity();
}
- public boolean awaitAllThreadsOnline(ActivityDef activityDef, long timeoutMs) {
- ActivityRuntimeInfo runtimeInfo = this.activityInfoMap.get(activityDef.getAlias());
- if (null == runtimeInfo) {
- throw new RuntimeException("could not stop missing activity:" + activityDef);
- }
-
- scenariologger.debug("STOP {}", activityDef.getAlias());
- return runtimeInfo.awaitAllThreadsOnline(timeoutMs);
- }
public synchronized void stop(Activity activity) {
stop(activity.getActivityDef());
}
- public boolean awaitAllThreadsOnline(Activity activity, long timeoutMs) {
- return awaitAllThreadsOnline(activity.getActivityDef(), timeoutMs);
- }
-
-
/**
* Stop an activity, given an activity def map. The only part of the map that is important is the
@@ -342,8 +323,8 @@ public class ContainerActivitiesController extends NBBaseComponent {
*/
public synchronized void forceStopActivities(int waitTimeMillis) {
logger.debug("force stopping scenario {}", description());
- activityInfoMap.values().forEach(a -> a.getActivityExecutor().forceStopActivity(2000));
- logger.debug("Scenario force stopped.");
+ throw new RuntimeException("implement me");
+ //logger.debug("Scenario force stopped.");
}
// public synchronized void stopAll() {
diff --git a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateImageTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateImageTest.java
deleted file mode 100644
index 2084f90d4..000000000
--- a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateImageTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2022-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.api.activityimpl.motor;
-
-import io.nosqlbench.engine.api.activityapi.core.RunState;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class RunStateImageTest {
-
- @Test
- public void testMaxStateImage() {
- int[] counts = new int[RunState.values().length];
- counts[RunState.Running.ordinal()]=3;
- counts[RunState.Starting.ordinal()]=2;
- RunStateImage image = new RunStateImage(counts, false);
- assertThat(image.is(RunState.Running)).isTrue();
- assertThat(image.is(RunState.Starting)).isTrue();
- assertThat(image.isTimeout()).isFalse();
- assertThat(image.is(RunState.Errored)).isFalse();
- assertThat(image.isNoneOther(RunState.Starting, RunState.Running)).isTrue();
- RunState maxState = image.getMaxState();
- assertThat(maxState).isEqualTo(RunState.values()[RunState.Running.ordinal()]);
- RunState minState = image.getMinState();
- assertThat(minState).isEqualTo(RunState.values()[RunState.Starting.ordinal()]);
- }
-
-}
diff --git a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateTallyTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateTallyTest.java
deleted file mode 100644
index 5eb13c631..000000000
--- a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateTallyTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 2022-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.api.activityimpl.motor;
-
-import io.nosqlbench.engine.api.activityapi.core.RunState;
-import org.junit.jupiter.api.*;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class RunStateTallyTest {
-
- volatile boolean awaited = false;
- volatile RunStateImage event = null;
-
- @BeforeEach
- public void setup() {
- awaited = false;
- event = null;
- }
-
- @Test
- @Order(1)
- public void testAwaitAny() {
- Thread.currentThread().setName("SETTER");
-
- RunStateTally tally = new RunStateTally();
- awaited = false;
- Thread waiter = new Thread(new Runnable() {
- @Override
- public void run() {
- event = tally.awaitAny(RunState.Running);
- awaited = true;
- }
- });
- waiter.setName("WAITER");
- waiter.setDaemon(true);
- waiter.start();
-
- try {
- Thread.sleep(100);
- } catch (Exception e) {
- }
-
- assertThat(awaited).isFalse();
- tally.add(RunState.Running);
-
- try {
- Thread.sleep(100);
- } catch (Exception e) {
- }
-
-
- assertThat(event.is(RunState.Running)).isTrue();
- assertThat(event.isOnly(RunState.Running)).isTrue();
-
- assertThat(awaited).isTrue();
- assertThat(waiter.getState()).isNotEqualTo(Thread.State.RUNNABLE);
- }
-
- @Test
- @Order(2)
- public void testAwaitNoneOf() {
- Thread.currentThread().setName("SETTER");
-
- RunStateTally tally = new RunStateTally();
- tally.add(RunState.Uninitialized);
- tally.add(RunState.Stopped);
- awaited = false;
- Thread waiter = new Thread(new Runnable() {
- @Override
- public void run() {
- tally.awaitNoneOf(RunState.Stopped, RunState.Uninitialized);
- awaited = true;
- }
- });
- waiter.setName("WAITER");
- waiter.setDaemon(true);
- waiter.start();
-
- try {
- Thread.sleep(100);
- } catch (Exception e) {
- }
-
- assertThat(awaited).isFalse();
- tally.change(RunState.Stopped, RunState.Finished);
-
- try {
- Thread.sleep(100);
- } catch (Exception e) {
- }
-
- assertThat(awaited).isFalse();
- tally.change(RunState.Uninitialized, RunState.Finished);
-
- try {
- Thread.sleep(100);
- } catch (Exception e) {
- }
-
- assertThat(awaited).isTrue();
- assertThat(waiter.getState()).isNotEqualTo(Thread.State.RUNNABLE);
-
- }
-
- @Test
- @Order(3)
- public void testAwaitNoneOther() {
- Thread.currentThread().setName("SETTER");
-
- RunStateTally tally = new RunStateTally();
- tally.add(RunState.Uninitialized);
- tally.add(RunState.Running);
- awaited = false;
- Thread waiter = new Thread(new Runnable() {
- @Override
- public void run() {
- event = tally.awaitNoneOther(RunState.Stopped, RunState.Finished);
- awaited = true;
- }
- });
- waiter.setName("WAITER");
- waiter.setDaemon(true);
- waiter.start();
-
- try {
- Thread.sleep(100);
- } catch (Exception e) {
- }
-
- assertThat(awaited).isFalse();
- tally.change(RunState.Uninitialized, RunState.Finished);
-
- try {
- Thread.sleep(100);
- } catch (Exception e) {
- }
-
- assertThat(awaited).isFalse();
-
- // Note that neither Stopped or Finished are required to be positive,
- // as long as all others are zero total.
- tally.remove(RunState.Running);
-
- try {
- Thread.sleep(100);
- } catch (Exception e) {
- }
-
- assertThat(awaited).isTrue();
- assertThat(waiter.getState()).isNotEqualTo(Thread.State.RUNNABLE);
-
- }
-
- @Test
- @Order(4)
- public void testAwaitNoneOtherTimedOut() {
- Thread.currentThread().setName("SETTER");
-
- RunStateTally tally = new RunStateTally();
- tally.add(RunState.Uninitialized);
- tally.add(RunState.Running);
- Thread waiter = new Thread(new Runnable() {
- @Override
- public void run() {
- event = tally.awaitNoneOther(1500, RunState.Stopped, RunState.Finished);
- awaited = true;
- }
- });
- waiter.setName("WAITER");
- waiter.setDaemon(true);
- waiter.start();
-
- try {
- Thread.sleep(100);
- } catch (Exception e) {
- }
-
- assertThat(awaited).isFalse();
- tally.change(RunState.Uninitialized, RunState.Finished);
-
- try {
- Thread.sleep(1500);
- } catch (Exception e) {
- }
-
-// try {
-// waiter.join();
-// } catch (InterruptedException e) {
-// throw new RuntimeException(e);
-// }
-
- assertThat(event.isOnly(RunState.Errored)).isFalse();
- assertThat(waiter.getState()).isNotEqualTo(Thread.State.RUNNABLE);
-
- }
-
-
-}
diff --git a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
deleted file mode 100644
index cc2d65bb8..000000000
--- a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2022-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;
-
-import io.nosqlbench.nb.api.config.standard.TestComponent;
-import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef;
-import io.nosqlbench.engine.api.activityapi.core.*;
-import io.nosqlbench.engine.api.activityapi.input.Input;
-import io.nosqlbench.engine.api.activityapi.input.InputDispenser;
-import io.nosqlbench.engine.api.activityapi.output.OutputDispenser;
-import io.nosqlbench.engine.api.activityimpl.CoreServices;
-import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
-import io.nosqlbench.engine.api.activityimpl.action.CoreActionDispenser;
-import io.nosqlbench.engine.api.activityimpl.input.CoreInputDispenser;
-import io.nosqlbench.engine.api.activityimpl.motor.CoreMotor;
-import io.nosqlbench.engine.api.activityimpl.motor.CoreMotorDispenser;
-import io.nosqlbench.engine.core.lifecycle.ExecutionResult;
-import io.nosqlbench.engine.core.lifecycle.activity.ActivityExecutor;
-import io.nosqlbench.engine.core.lifecycle.activity.ActivityTypeLoader;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.*;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-class ActivityExecutorTest {
- private static final Logger logger = LogManager.getLogger(ActivityExecutorTest.class);
-
-// TODO: Design review of this mechanism
-// @Test
-// synchronized void testRestart() {
-// ActivityDef activityDef = ActivityDef.parseActivityDef("driver=diag;alias=test-restart;cycles=1000;cyclerate=10;op=initdelay:initdelay=5000;");
-// new ActivityTypeLoader().load(activityDef);
-//
-// final Activity activity = new DelayedInitActivity(activityDef);
-// InputDispenser inputDispenser = new CoreInputDispenser(activity);
-// ActionDispenser adisp = new CoreActionDispenser(activity);
-// OutputDispenser tdisp = CoreServices.getOutputDispenser(activity).orElse(null);
-//
-// final MotorDispenser mdisp = new CoreMotorDispenser(activity, inputDispenser, adisp, tdisp);
-// activity.setActionDispenserDelegate(adisp);
-// activity.setOutputDispenserDelegate(tdisp);
-// activity.setInputDispenserDelegate(inputDispenser);
-// activity.setMotorDispenserDelegate(mdisp);
-//
-// final ExecutorService executor = Executors.newCachedThreadPool();
-// ActivityExecutor activityExecutor = new ActivityExecutor(activity, "test-restart");
-// final Future future = executor.submit(activityExecutor);
-// try {
-// activityDef.setThreads(1);
-// activityExecutor.startActivity();
-// Thread.sleep(100L);
-// activityExecutor.stopActivity();
-// Thread.sleep(100L);
-// activityExecutor.startActivity();
-// Thread.sleep(100L);
-// activityExecutor.stopActivity();
-// future.get();
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
-// executor.shutdown();
-// assertThat(inputDispenser.getInput(10).getInputSegment(3)).isNotNull();
-//
-// }
-
- @Test
- synchronized void testDelayedStartSanity() {
-
- ActivityDef activityDef = ActivityDef.parseActivityDef("driver=diag;alias=test-delayed-start;cycles=1000;initdelay=2000;");
- new ActivityTypeLoader().load(activityDef, TestComponent.INSTANCE);
-
- Activity activity = new DelayedInitActivity(activityDef);
- final InputDispenser inputDispenser = new CoreInputDispenser(activity);
- final ActionDispenser actionDispenser = new CoreActionDispenser(activity);
- final OutputDispenser outputDispenser = CoreServices.getOutputDispenser(activity).orElse(null);
-
- MotorDispenser motorDispenser = new CoreMotorDispenser(activity, inputDispenser, actionDispenser, outputDispenser);
- activity.setActionDispenserDelegate(actionDispenser);
- activity.setOutputDispenserDelegate(outputDispenser);
- activity.setInputDispenserDelegate(inputDispenser);
- activity.setMotorDispenserDelegate(motorDispenser);
-
- ActivityExecutor activityExecutor = new ActivityExecutor(activity);
-
- ExecutorService testExecutor = Executors.newCachedThreadPool();
- Future future = testExecutor.submit(activityExecutor);
-
- try {
- activityDef.setThreads(1);
- future.get();
- testExecutor.shutdownNow();
-
- } catch (final Exception e) {
- fail("Unexpected exception", e);
- }
-
- assertThat(inputDispenser.getInput(10).getInputSegment(3)).isNull();
- }
-
- @Test
- synchronized void testNewActivityExecutor() {
-
- final ActivityDef activityDef = ActivityDef.parseActivityDef("driver=diag;alias=test-dynamic-params;cycles=1000;initdelay=5000;");
- new ActivityTypeLoader().load(activityDef,TestComponent.INSTANCE);
-
- Activity simpleActivity = new SimpleActivity(TestComponent.INSTANCE,activityDef);
-
-// this.getActivityMotorFactory(this.motorActionDelay(999), new AtomicInput(simpleActivity,activityDef));
-
- final InputDispenser inputDispenser = new CoreInputDispenser(simpleActivity);
- final ActionDispenser actionDispenser = new CoreActionDispenser(simpleActivity);
- final OutputDispenser outputDispenser = CoreServices.getOutputDispenser(simpleActivity).orElse(null);
-
- MotorDispenser motorDispenser = new CoreMotorDispenser<>(simpleActivity,
- inputDispenser, actionDispenser, outputDispenser);
-
- simpleActivity.setActionDispenserDelegate(actionDispenser);
- simpleActivity.setInputDispenserDelegate(inputDispenser);
- simpleActivity.setMotorDispenserDelegate(motorDispenser);
-
- ActivityExecutor activityExecutor = new ActivityExecutor(simpleActivity);
- activityDef.setThreads(5);
- ForkJoinTask executionResultForkJoinTask = ForkJoinPool.commonPool().submit(activityExecutor);
-
-// activityExecutor.startActivity();
-
- final int[] speeds = {1, 50, 5, 50, 2, 50};
- for (int offset = 0; offset < speeds.length; offset += 2) {
- final int threadTarget = speeds[offset];
- final int threadTime = speeds[offset + 1];
-
- ActivityExecutorTest.logger.debug(() -> "Setting thread level to " + threadTarget + " for " + threadTime + " seconds.");
- activityDef.setThreads(threadTarget);
-
- try {
- Thread.sleep(threadTime);
- } catch (final Exception e) {
- fail("Not expecting exception", e);
- }
- }
- executionResultForkJoinTask.cancel(true);
-
- // Used for slowing the roll due to state transitions in test.
- try {
- activityExecutor.stopActivity();
-// Thread.sleep(2000L);
- } catch (final Exception e) {
- fail("Not expecting exception", e);
- }
- }
-
- private MotorDispenser getActivityMotorFactory(final Action lc, Input ls) {
- return new MotorDispenser<>() {
- @Override
- public Motor getMotor(final ActivityDef activityDef, final int slotId) {
- final Activity activity = new SimpleActivity(TestComponent.INSTANCE,activityDef);
- final Motor cm = new CoreMotor<>(activity, slotId, ls);
- cm.setAction(lc);
- return cm;
- }
- };
- }
-
- private SyncAction motorActionDelay(long delay) {
- return new SyncAction() {
- @Override
- public int runCycle(final long cycle) {
- ActivityExecutorTest.logger.info(() -> "consuming " + cycle + ", delaying:" + delay);
- try {
- Thread.sleep(delay);
- } catch (final InterruptedException ignored) {
- }
- return 0;
- }
- };
-
- }
-
- private static class DelayedInitActivity extends SimpleActivity {
- private static final Logger logger = LogManager.getLogger(DelayedInitActivity.class);
-
- public DelayedInitActivity(final ActivityDef activityDef) {
- super(TestComponent.INSTANCE,activityDef);
- }
-
- @Override
- public void initActivity() {
- final Integer initDelay = this.activityDef.getParams().getOptionalInteger("initdelay").orElse(0);
- DelayedInitActivity.logger.info(() -> "delaying for " + initDelay);
- try {
- Thread.sleep(initDelay);
- } catch (final InterruptedException ignored) {
- }
- DelayedInitActivity.logger.info(() -> "delayed for " + initDelay);
- }
- }
-}
diff --git a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java
deleted file mode 100644
index e210ddd23..000000000
--- a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2022-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;
-
-import io.nosqlbench.nb.api.config.standard.TestComponent;
-import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef;
-import io.nosqlbench.engine.api.activityapi.core.Action;
-import io.nosqlbench.engine.api.activityapi.core.Activity;
-import io.nosqlbench.engine.api.activityapi.core.Motor;
-import io.nosqlbench.engine.api.activityapi.core.SyncAction;
-import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
-import io.nosqlbench.engine.api.activityimpl.motor.CoreMotor;
-import io.nosqlbench.engine.core.fortesting.BlockingSegmentInput;
-import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicLongArray;
-import java.util.function.Predicate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class CoreMotorTest {
-
- @Test
- public void testBasicActivityMotor() {
- final Activity activity = new SimpleActivity(
- new TestComponent("testing", "coremotor"),
- ActivityDef.parseActivityDef("alias=foo")
- );
- final BlockingSegmentInput lockstepper = new BlockingSegmentInput();
- final Motor cm = new CoreMotor(activity, 5L, lockstepper);
- final AtomicLong observableAction = new AtomicLong(-3L);
- cm.setAction(this.getTestConsumer(observableAction));
- final Thread t = new Thread(cm);
- t.setName("TestMotor");
- t.start();
- try {
- Thread.sleep(1000); // allow action time to be waiting in monitor for test fixture
- } catch (final InterruptedException ignored) {
- }
-
- lockstepper.publishSegment(5L);
- final boolean result = this.awaitCondition(atomicInteger -> 5L == atomicInteger.get(), observableAction, 5000, 100);
- assertThat(observableAction.get()).isEqualTo(5L);
- }
-
- @Test
- public void testIteratorStride() {
- SimpleActivity activity = new SimpleActivity(TestComponent.INSTANCE, "stride=3");
- final BlockingSegmentInput lockstepper = new BlockingSegmentInput();
- final Motor cm1 = new CoreMotor(activity, 1L, lockstepper);
- final AtomicLongArray ary = new AtomicLongArray(10);
- final Action a1 = this.getTestArrayConsumer(ary);
- cm1.setAction(a1);
-
- final Thread t1 = new Thread(cm1);
- t1.setName("cm1");
- t1.start();
- try {
- Thread.sleep(500); // allow action time to be waiting in monitor for test fixture
- } catch (final InterruptedException ignored) {
- }
-
- lockstepper.publishSegment(11L, 12L, 13L);
-
- final boolean result = this.awaitAryCondition(ala -> 13L == ala.get(2), ary, 5000, 100);
- assertThat(ary.get(0)).isEqualTo(11L);
- assertThat(ary.get(1)).isEqualTo(12L);
- assertThat(ary.get(2)).isEqualTo(13L);
- assertThat(ary.get(3)).isEqualTo(0L);
-
- }
-
- private SyncAction getTestArrayConsumer(AtomicLongArray ary) {
- return new SyncAction() {
- private int offset;
-
- @Override
- public int runCycle(final long cycle) {
- ary.set(this.offset, cycle);
- this.offset++;
- return 0;
- }
- };
- }
-
- private SyncAction getTestConsumer(AtomicLong atomicLong) {
- return new SyncAction() {
- @Override
- public int runCycle(final long cycle) {
- atomicLong.set(cycle);
- return 0;
- }
- };
- }
-
-
- private boolean awaitAryCondition(final Predicate atomicLongAryPredicate, final AtomicLongArray ary, final long millis, final long retry) {
- final long start = System.currentTimeMillis();
- long now = start;
- while (now < (start + millis)) {
- final boolean result = atomicLongAryPredicate.test(ary);
- if (result) return true;
- try {
- Thread.sleep(retry);
- } catch (final InterruptedException ignored) {
- }
- now = System.currentTimeMillis();
- }
- return false;
- }
-
- private boolean awaitCondition(final Predicate atomicPredicate, final AtomicLong atomicInteger, final long millis, final long retry) {
- final long start = System.currentTimeMillis();
- long now = start;
- while (now < (start + millis)) {
- final boolean result = atomicPredicate.test(atomicInteger);
- if (result) return true;
- try {
- Thread.sleep(retry);
- } catch (final InterruptedException ignored) {
- }
- now = System.currentTimeMillis();
- }
- return false;
- }
-}
diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutorShutdownHook.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/coords/VirtualCoord.java
similarity index 57%
rename from nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutorShutdownHook.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/coords/VirtualCoord.java
index 07b2be4ec..1c9550c04 100644
--- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutorShutdownHook.java
+++ b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/coords/VirtualCoord.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022-2023 nosqlbench
+ * Copyright (c) 2024 nosqlbench
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,18 +14,14 @@
* limitations under the License.
*/
-package io.nosqlbench.engine.core.lifecycle.activity;
+package io.nosqlbench.virtdata.api.coords;
-public class ActivityExecutorShutdownHook extends Thread {
-
- private final ActivityExecutor activityExecutor;
- public ActivityExecutorShutdownHook(ActivityExecutor activityExecutor) {
- this.activityExecutor = activityExecutor;
- }
-
- @Override
- public void run() {
- activityExecutor.finish(false);
- }
+/**
+ * A virtual coordinate, meant to index into virtual data space with named dimensions
+ */
+public record VirtualCoord(
+ VirtualSpace space,
+ long[] coords
+) {
}
diff --git a/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/coords/VirtualSpace.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/coords/VirtualSpace.java
new file mode 100644
index 000000000..239188e3c
--- /dev/null
+++ b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/coords/VirtualSpace.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 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.virtdata.api.coords;
+
+public record VirtualSpace(
+ String[] names
+) {
+ public static VirtualSpace BASE =
+ new VirtualSpace(new String[] {
+ "recycle",
+ "cycle",
+ "stride"
+ });
+}
diff --git a/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java
index 06f51e3c7..3420289ab 100644
--- a/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java
+++ b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java
@@ -33,7 +33,7 @@ import java.util.function.LongToIntFunction;
@Categories({Category.general})
public class AlphaNumericString implements LongFunction {
private static final String AVAILABLE_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- private final ThreadLocal threadStringBuilder = ThreadLocal.withInitial(StringBuilder::new);
+// private final ThreadLocal threadStringBuilder = ThreadLocal.withInitial(StringBuilder::new);
private final Hash hash = new Hash();
private final LongToIntFunction lengthFunc;
@@ -69,8 +69,7 @@ public class AlphaNumericString implements LongFunction {
}
long hashValue = operand;
- StringBuilder sb = threadStringBuilder.get();
- sb.setLength(0);
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < length; i++)
{
hashValue = hash.applyAsLong(hashValue);
diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_reset.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_reset.java
index 4fa690440..8e3fb790a 100644
--- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_reset.java
+++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_reset.java
@@ -94,7 +94,11 @@ public class CMD_reset extends NBBaseCommand {
//TODO: This needs to be reworked, but simply calling controller.start on the flywheel results in 2
// copies of the activity running simultaneously. This is a temporary workaround.
SimFrameUtils.awaitActivity(flywheel);
- flywheel.getMotorDispenserDelegate().getMotor(flywheel.getActivityDef(), 0).run();
+ try {
+ flywheel.getMotorDispenserDelegate().getMotor(flywheel.getActivityDef(), 0).call();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
return null;
diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/findmax/FindmaxFrameFunction.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/findmax/FindmaxFrameFunction.java
index 3a64fd2cd..a363ff3ff 100644
--- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/findmax/FindmaxFrameFunction.java
+++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/findmax/FindmaxFrameFunction.java
@@ -62,7 +62,7 @@ public class FindmaxFrameFunction implements SimFrameFunction
capture.stopWindow();
journal.record(params,capture.last());
System.out.println(journal.last());
- if (flywheel.getRunStateTally().tallyFor(RunState.Running)==0) {
+ if (flywheel.getRunState()!=RunState.Running) {
System.out.println("state:" + flywheel.getRunState());
throw new RuntimeException("Early exit of flywheel activity '" + flywheel.getAlias() + "'. Can't continue.");
+
}
return journal.last().value();
}
diff --git a/nbr/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java b/nbr/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java
index 334b6ef06..a9ebabf72 100644
--- a/nbr/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java
+++ b/nbr/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java
@@ -34,7 +34,7 @@ class ExitStatusIntegrationTests {
ProcessInvoker invoker = new ProcessInvoker();
invoker.setLogDir("logs/test");
ProcessResult result = invoker.run("exitstatus_badparam", 15,
- java, "-jar", JARNAME, "--logs-dir", "logs/test/badparam/",
+ java, "--enable-preview", "-jar", JARNAME, "--logs-dir", "logs/test/badparam/",
"badparam"
);
assertThat(result.exception).isNull();
@@ -48,7 +48,7 @@ class ExitStatusIntegrationTests {
ProcessInvoker invoker = new ProcessInvoker();
invoker.setLogDir("logs/test");
ProcessResult result = invoker.run("exitstatus_initexception", 15,
- java, "-jar", JARNAME, "--logs-dir", "logs/test/initerror", "run",
+ java, "--enable-preview", "-jar", JARNAME, "--logs-dir", "logs/test/initerror", "run",
"driver=diag", "op=initdelay:initdelay=notanumber"
);
assertThat(result.exception).isNull();
@@ -64,7 +64,8 @@ class ExitStatusIntegrationTests {
// Forcing a thread exception via basic command issue.
ProcessResult result = invoker.run("exitstatus_threadexception", 30,
- "java", "-jar", JARNAME, "--logs-dir", "logs/test/threadexcep", "--logs-level", "debug", "run",
+ "java", "--enable-preview", "-jar", JARNAME, "--logs-dir", "logs/test/threadexcep", "--logs-level",
+ "debug", "run",
"driver=diag", "cyclerate=10", "not_a_thing", "cycles=100", "-vvv"
);
String stdout = String.join("\n", result.getStdoutData());
@@ -77,7 +78,8 @@ class ExitStatusIntegrationTests {
ProcessInvoker invoker = new ProcessInvoker();
invoker.setLogDir("logs/test");
ProcessResult result = invoker.run("exitstatus_asyncstoprequest", 60,
- "java", "-jar", JARNAME, "--logs-dir", "logs/test/asyncstop", "--logs-level", "debug", "run",
+ "java", "--enable-preview", "-jar", JARNAME, "--logs-dir", "logs/test/asyncstop", "--logs-level",
+ "debug", "run",
"driver=diag", "threads=2", "cyclerate=10", "op=erroroncycle:erroroncycle=10", "cycles=50", "-vvv"
);
assertThat(result.exception).isNull();