Skip to content

Commit 089bbea

Browse files
authored
Set CanceledFailureInfo for all canceled Nexus outcomes (#2253)
1 parent 156f4f1 commit 089bbea

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowService.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,12 @@ public void respondNexusTaskCompleted(
813813
}
814814

815815
if (request.getResponse().hasCancelOperation()) {
816-
mutableState.cancelNexusOperation(tt.getOperationRef(), null);
816+
Failure canceled =
817+
Failure.newBuilder()
818+
.setMessage("operation canceled")
819+
.setCanceledFailureInfo(CanceledFailureInfo.getDefaultInstance())
820+
.build();
821+
mutableState.cancelNexusOperation(tt.getOperationRef(), canceled);
817822
} else if (request.getResponse().hasStartOperation()) {
818823
StartOperationResponse startResp = request.getResponse().getStartOperation();
819824
if (startResp.hasOperationError()) {
@@ -913,8 +918,7 @@ public void completeNexusOperation(NexusOperationRef ref, HistoryEvent completio
913918
Failure canceled =
914919
Failure.newBuilder()
915920
.setMessage("operation canceled")
916-
.setApplicationFailureInfo(
917-
ApplicationFailureInfo.newBuilder().setNonRetryable(true))
921+
.setCanceledFailureInfo(CanceledFailureInfo.getDefaultInstance())
918922
.build();
919923
target.cancelNexusOperation(ref, canceled);
920924
break;

temporal-test-server/src/test/java/io/temporal/testserver/functional/NexusWorkflowTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,7 @@ public void testNexusOperationAsyncHandlerCanceled() {
287287
Assert.assertEquals("nexus operation completed unsuccessfully", failure.getMessage());
288288
io.temporal.api.failure.v1.Failure cause = failure.getCause();
289289
Assert.assertEquals("operation canceled", cause.getMessage());
290-
Assert.assertNotNull(cause.getApplicationFailureInfo());
291-
Assert.assertTrue(cause.getApplicationFailureInfo().getNonRetryable());
290+
Assert.assertTrue(cause.hasCanceledFailureInfo());
292291
} catch (Exception e) {
293292
Assert.fail(e.getMessage());
294293
} finally {
@@ -529,7 +528,9 @@ public void testNexusOperationCancellation() {
529528
events.get(0).getNexusOperationCanceledEventAttributes().getFailure();
530529
assertOperationFailureInfo(operationId, failure.getNexusOperationExecutionFailureInfo());
531530
Assert.assertEquals("nexus operation completed unsuccessfully", failure.getMessage());
532-
Assert.assertFalse(failure.hasCause());
531+
io.temporal.api.failure.v1.Failure cause = failure.getCause();
532+
Assert.assertEquals("operation canceled", cause.getMessage());
533+
Assert.assertTrue(cause.hasCanceledFailureInfo());
533534
} catch (Exception e) {
534535
Assert.fail(e.getMessage());
535536
} finally {

0 commit comments

Comments
 (0)