Skip to content

Fix cancellation test issue #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slinkydeveloper merged 1 commit into from
Mar 5, 2025
Merged

Fix cancellation test issue #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions sdk-common/src/main/java/dev/restate/sdk/types/TerminalException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ public class TerminalException extends RuntimeException {
private final int code;

public TerminalException() {
this.code = INTERNAL_SERVER_ERROR_CODE;
this(INTERNAL_SERVER_ERROR_CODE);
}

/** Like {@link #TerminalException(int, String)}, without message. */
public TerminalException(int code) {
this.code = code;
this(code, "Error " + code);
}

/**
Expand Down
6 changes: 1 addition & 5 deletions sdk-core/src/main/java/dev/restate/sdk/core/HandlerContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,7 @@ public CompletableFuture<AsyncResult<String>> send(
int sendHandle =
this.stateMachine.send(target, parameter, idempotencyKey, headers, delay);

AsyncResultInternal<String> invocationIdAsyncResult =
AsyncResults.single(this, sendHandle, invocationIdCompleter());
this.invocationIdsToCancel.add(invocationIdAsyncResult);

return invocationIdAsyncResult;
return AsyncResults.single(this, sendHandle, invocationIdCompleter());
});
}

Expand Down
6 changes: 3 additions & 3 deletions test-services/src/main/kotlin/dev/restate/sdk/testservices/CancelTestImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class CancelTestImpl {
}

override suspend fun startTest(context: ObjectContext, operation: BlockingOperation) {
val client = CancelTestBlockingServiceClient.fromContext(context, "")
val client = CancelTestBlockingServiceClient.fromContext(context, context.key())

try {
client.block(operation).await()
Expand All @@ -44,8 +44,8 @@ class CancelTestImpl {

class BlockingService : CancelTest.BlockingService {
override suspend fun block(context: ObjectContext, operation: BlockingOperation) {
val self = CancelTestBlockingServiceClient.fromContext(context, "")
val client = AwakeableHolderClient.fromContext(context, "cancel")
val self = CancelTestBlockingServiceClient.fromContext(context, context.key())
val client = AwakeableHolderClient.fromContext(context, context.key())

val awakeable = context.awakeable<String>()
client.hold(awakeable.id).await()
Expand Down
Loading