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

logically isolate concurrent concurrency tests

Browse Source
This commit is contained in:
Jonathan Shook 2023-02-05 21:20:10 -06:00
parent 58c4de8122
commit ce54eced7e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java
View File

@ -280,7 +280,7 @@ public class ActivityExecutor implements ActivityController, ParameterMap.Listen
} }
} }
private void alignMotorStateToIntendedActivityState() { private synchronized void alignMotorStateToIntendedActivityState() {
RunState intended = activity.getRunState(); RunState intended = activity.getRunState();
logger.trace(() -> "ADJUSTING to INTENDED " + intended); logger.trace(() -> "ADJUSTING to INTENDED " + intended);
switch (intended) { switch (intended) {

7
engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
View File

@ -47,7 +47,7 @@ class ActivityExecutorTest {
@Test @Test
synchronized void testRestart() { synchronized void testRestart() {
ActivityDef activityDef = ActivityDef.parseActivityDef("driver=diag;alias=test;cycles=1000;op=initdelay:initdelay=5000;"); ActivityDef activityDef = ActivityDef.parseActivityDef("driver=diag;alias=test-restart;cycles=1000;cyclerate=1;op=initdelay:initdelay=5000;");
new ActivityTypeLoader().load(activityDef); new ActivityTypeLoader().load(activityDef);
final Activity activity = new DelayedInitActivity(activityDef); final Activity activity = new DelayedInitActivity(activityDef);
@ -67,6 +67,7 @@ class ActivityExecutorTest {
try { try {
activityDef.setThreads(1); activityDef.setThreads(1);
activityExecutor.startActivity(); activityExecutor.startActivity();
Thread.sleep(500L);
activityExecutor.stopActivity(); activityExecutor.stopActivity();
activityExecutor.startActivity(); activityExecutor.startActivity();
activityExecutor.stopActivity(); activityExecutor.stopActivity();
@ -82,7 +83,7 @@ class ActivityExecutorTest {
@Test @Test
synchronized void testDelayedStartSanity() { synchronized void testDelayedStartSanity() {
final ActivityDef activityDef = ActivityDef.parseActivityDef("driver=diag;alias=test;cycles=1000;initdelay=2000;"); final ActivityDef activityDef = ActivityDef.parseActivityDef("driver=diag;alias=test-delayed-start;cycles=1000;initdelay=2000;");
new ActivityTypeLoader().load(activityDef); new ActivityTypeLoader().load(activityDef);
final Activity activity = new DelayedInitActivity(activityDef); final Activity activity = new DelayedInitActivity(activityDef);
@ -118,7 +119,7 @@ class ActivityExecutorTest {
@Test @Test
synchronized void testNewActivityExecutor() { synchronized void testNewActivityExecutor() {
ActivityDef activityDef = ActivityDef.parseActivityDef("driver=diag;alias=test;cycles=1000;initdelay=5000;"); ActivityDef activityDef = ActivityDef.parseActivityDef("driver=diag;alias=test-dynamic-params;cycles=1000;initdelay=5000;");
new ActivityTypeLoader().load(activityDef); new ActivityTypeLoader().load(activityDef);
getActivityMotorFactory(motorActionDelay(999), new AtomicInput(activityDef)); getActivityMotorFactory(motorActionDelay(999), new AtomicInput(activityDef));