diff --git a/activitytype-cql/pom.xml b/activitytype-cql/pom.xml
index 47e4bf36c..159aef9b8 100644
--- a/activitytype-cql/pom.xml
+++ b/activitytype-cql/pom.xml
@@ -4,7 +4,7 @@
io.nosqlbench
mvn-defaults
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -23,7 +23,7 @@
io.nosqlbench
engine-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/activitytype-cqlverify/pom.xml b/activitytype-cqlverify/pom.xml
index 8f749dfd5..08a96ec61 100644
--- a/activitytype-cqlverify/pom.xml
+++ b/activitytype-cqlverify/pom.xml
@@ -4,7 +4,7 @@
io.nosqlbench
mvn-defaults
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -24,7 +24,7 @@
io.nosqlbench
activitytype-cql
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/activitytype-diag/pom.xml b/activitytype-diag/pom.xml
index 379848935..002e61017 100644
--- a/activitytype-diag/pom.xml
+++ b/activitytype-diag/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -20,7 +20,7 @@
io.nosqlbench
engine-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/activitytype-http/pom.xml b/activitytype-http/pom.xml
index 104d91f59..fa179262e 100644
--- a/activitytype-http/pom.xml
+++ b/activitytype-http/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -21,7 +21,7 @@
io.nosqlbench
engine-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/activitytype-stdout/pom.xml b/activitytype-stdout/pom.xml
index 30d05440b..3d757328c 100644
--- a/activitytype-stdout/pom.xml
+++ b/activitytype-stdout/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -21,7 +21,7 @@
io.nosqlbench
engine-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/activitytype-tcp/pom.xml b/activitytype-tcp/pom.xml
index 2134d5339..1af6fb1dd 100644
--- a/activitytype-tcp/pom.xml
+++ b/activitytype-tcp/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -23,13 +23,13 @@
io.nosqlbench
engine-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
activitytype-stdout
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/docsys/pom.xml b/docsys/pom.xml
index 731d3f0d7..2ec4e62ba 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -18,7 +18,7 @@
io.nosqlbench
nb-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
@@ -112,7 +112,7 @@
io.nosqlbench
virtdata-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index e69a62d79..f50073cf4 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -22,13 +22,13 @@
io.nosqlbench
nb-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
virtdata-userlibs
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java
index ccbe37c6a..5bde23134 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java
@@ -48,6 +48,7 @@ public enum RunState {
default:
return false;
case Uninitialized: // A motor was just created. This is its initial state.
+ case Stopped:
switch (to) {
case Starting: // a motor has been reserved for an execution command
return true;
@@ -76,14 +77,7 @@ public enum RunState {
return true;
default:
return false;
- }
- case Stopped:
- switch (to) {
- case Running: // A motor was restarted after being stopped
- return true;
- default:
- return false;
- }
+ }// A motor was restarted after being stopped
case Finished:
switch (to) {
case Running: // A motor was restarted?
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index daa4e4dd8..cb3aa0b2a 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -23,7 +23,7 @@
io.nosqlbench
engine-core
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
@@ -47,7 +47,7 @@
io.nosqlbench
engine-docker
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 93e8814c5..988b7a082 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -28,7 +28,7 @@
io.nosqlbench
engine-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java
index 6f2327e00..79641fb66 100644
--- a/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java
+++ b/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java
@@ -38,6 +38,30 @@ import static org.assertj.core.api.Assertions.assertThat;
public class ActivityExecutorTest {
private static final Logger logger = LoggerFactory.getLogger(ActivityExecutorTest.class);
+ @Test
+ public void testRestart() {
+ ActivityDef ad = ActivityDef.parseActivityDef("driver=diag;alias=test;cycles=1000;initdelay=5000;");
+ Optional activityType = ActivityType.FINDER.get(ad.getActivityType());
+ Activity a = new DelayedInitActivity(ad);
+ InputDispenser idisp = new CoreInputDispenser(a);
+ ActionDispenser adisp = new CoreActionDispenser(a);
+ OutputDispenser tdisp = CoreServices.getOutputDispenser(a).orElse(null);
+ MotorDispenser> mdisp = new CoreMotorDispenser(a, idisp, adisp, tdisp);
+ a.setActionDispenserDelegate(adisp);
+ a.setOutputDispenserDelegate(tdisp);
+ a.setInputDispenserDelegate(idisp);
+ a.setMotorDispenserDelegate(mdisp);
+
+ ActivityExecutor ae = new ActivityExecutor(a);
+ ad.setThreads(1);
+ ae.startActivity();
+ ae.stopActivity();
+ ae.startActivity();
+ ae.awaitCompletion(15000);
+ assertThat(idisp.getInput(10).getInputSegment(3)).isNull();
+
+ }
+
@Test
public void testDelayedStartSanity() {
ActivityDef ad = ActivityDef.parseActivityDef("driver=diag;alias=test;cycles=1000;initdelay=5000;");
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index 58241f061..9c8366ada 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -77,7 +77,7 @@
io.nosqlbench
engine-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index c07fc559e..82ce2cf8a 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -28,7 +28,7 @@
io.nosqlbench
docsys
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index bb2cab555..9523a4e54 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -22,7 +22,7 @@
io.nosqlbench
engine-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index f5027abd5..050cac32c 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
io.nosqlbench
mvn-defaults
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
pom
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 31cc66b49..07c4e1b47 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
diff --git a/nb/pom.xml b/nb/pom.xml
index fee2e9e59..f50c1138e 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -24,61 +24,61 @@
io.nosqlbench
engine-cli
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
engine-docs
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
engine-core
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
engine-extensions
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
activitytype-stdout
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
activitytype-diag
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
activitytype-tcp
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
activitytype-http
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
activitytype-cql
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
activitytype-cqlverify
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 591f435bb..62e637901 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
mvn-defaults
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index e666de0e1..6011b483a 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
io.nosqlbench
mvn-defaults
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -23,14 +23,14 @@
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
nb-api
io.nosqlbench
virtdata-lang
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 9b687e92f..b5c0f126e 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index 6333643eb..b17907b4b 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -20,7 +20,7 @@
io.nosqlbench
virtdata-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index 468f63219..b72cb6e6e 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -22,13 +22,13 @@
io.nosqlbench
virtdata-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
virtdata-lib-basics
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index ed84c91bc..4ca307f69 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -20,13 +20,13 @@
io.nosqlbench
virtdata-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
virtdata-lib-basics
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 89e9197e9..5f6a619f2 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -24,7 +24,7 @@
io.nosqlbench
virtdata-lib-basics
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index 86d97ffc1..818570235 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -18,7 +18,7 @@
io.nosqlbench
virtdata-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 3f8ba02b4..c1a7b62d1 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
../mvn-defaults
@@ -17,38 +17,38 @@
io.nosqlbench
virtdata-realdata
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
virtdata-lib-realer
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
virtdata-api
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
virtdata-lib-random
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
virtdata-lib-basics
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
virtdata-lib-curves4
io.nosqlbench
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT
io.nosqlbench
docsys
- 3.12.80-SNAPSHOT
+ 3.12.81-SNAPSHOT