Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/project.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
release:
current-version: 7.13.4.Final
current-version: 7.13.5.Final
next-version: 8.0.0-SNAPSHOT
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import static io.serverlessworkflow.impl.WorkflowUtils.safeClose;

import java.time.Duration;
import java.util.Optional;
import java.util.concurrent.ExecutorService;

Expand All @@ -27,7 +26,6 @@ public static class Builder {

private final PersistenceInstanceStore store;
private ExecutorService executorService;
private Duration closeTimeout;

private Builder(PersistenceInstanceStore store) {
this.store = store;
Expand All @@ -38,17 +36,9 @@ public Builder withExecutorService(ExecutorService executorService) {
return this;
}

public Builder withCloseTimeout(Duration closeTimeout) {
this.closeTimeout = closeTimeout;
return this;
}

public PersistenceInstanceHandlers build() {
return new DefaultPersistenceInstanceHandlers(
new DefaultPersistenceInstanceWriter(
store,
Optional.ofNullable(executorService),
closeTimeout == null ? Duration.ofSeconds(1) : closeTimeout),
new DefaultPersistenceInstanceWriter(store, Optional.ofNullable(executorService)),
new DefaultPersistenceInstanceReader(store),
store);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import io.serverlessworkflow.impl.WorkflowContextData;
import io.serverlessworkflow.impl.WorkflowDefinitionData;
import java.time.Duration;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
Expand All @@ -32,18 +31,14 @@ public class DefaultPersistenceInstanceWriter extends AbstractPersistenceInstanc
private final PersistenceInstanceStore store;
private final Map<String, CompletableFuture<Void>> futuresMap = new ConcurrentHashMap<>();
private final Optional<ExecutorService> executorService;
private final Duration closeTimeout;

private static final Logger logger =
LoggerFactory.getLogger(DefaultPersistenceInstanceWriter.class);

protected DefaultPersistenceInstanceWriter(
PersistenceInstanceStore store,
Optional<ExecutorService> executorService,
Duration closeTimeout) {
PersistenceInstanceStore store, Optional<ExecutorService> executorService) {
this.store = store;
this.executorService = executorService;
this.closeTimeout = closeTimeout;
}

@Override
Expand Down Expand Up @@ -76,7 +71,7 @@ private void executeTransaction(
try {
transaction.rollback(definition);
} catch (Exception rollEx) {
logger.warn("Exception during rollback. Ignoring it", ex);
logger.warn("Exception during rollback. Ignoring it", rollEx);
}
throw ex;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,42 @@
import java.time.Duration;
import java.util.Collection;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Stream;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;

public class MvStorePersistenceTest {

@Test
void testSimpleRun() throws Exception {
final String dbName = "db-samples/simple.db";
ExecutorService service = Executors.newSingleThreadExecutor();
try (PersistenceInstanceHandlers handlers =
DefaultPersistenceInstanceHandlers.builder(new MVStorePersistenceStore(dbName))
.withExecutorService(Executors.newSingleThreadExecutor())
.withCloseTimeout(Duration.ofMillis(100))
.withExecutorService(service)
.build();
WorkflowApplication application =
PersistenceApplicationBuilder.builder(WorkflowApplication.builder(), handlers.writer())
.build(); ) {
WorkflowDefinition definition =
application.workflowDefinition(
readWorkflowFromClasspath("workflows-samples/simple-expression.yaml"));
assertNoInstance(handlers, definition);
assertThat(assertNoInstance(handlers, definition)).isTrue();
definition.instance(Map.of()).start().join();
handlers.writer().close();
assertNoInstance(handlers, definition);
Awaitility.await()
.atMost(Duration.ofSeconds(1))
.until(() -> assertNoInstance(handlers, definition));
} finally {
Files.delete(Path.of(dbName));
}
}

private void assertNoInstance(
private boolean assertNoInstance(
PersistenceInstanceHandlers handlers, WorkflowDefinition definition) {
try (Stream<WorkflowInstance> stream = handlers.reader().scanAll(definition)) {
assertThat(stream.count()).isEqualTo(0);
return stream.count() == 0;
}
}

Expand Down