Update terminate logic to handle scheduled orchestrations #276
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cgillum
commented
Oct 14, 2024
| @@ -196,6 +196,7 @@ public static bool HasPayload(HistoryEvent e) | |||
| return historyEvent.EventType switch | |||
| { | |||
| EventType.ExecutionStarted => ((ExecutionStartedEvent)historyEvent).Version, | |||
| EventType.SubOrchestrationInstanceCreated => ((SubOrchestrationInstanceCreatedEvent)historyEvent).Version, | |||
There was a problem hiding this comment.
This is an unrelated fix that I happened to notice independently. I'm just adding it to this PR as a convenience since it's a small change.
andystaples
reviewed
Oct 14, 2024
| IF @Reason IS NOT NULL | ||
| -- Note that we don't use the Reason column for the Reason with terminate events | ||
| SET @PayloadID = NEWID() | ||
| INSERT INTO Payloads ([TaskHub], [InstanceID], [PayloadID], [Text]) |
There was a problem hiding this comment.
The comment in line#468 states that the table order for this sproc should be Instances --> (NewEvents --> Payloads --> NewEvents) but this PR changes the table order to Instances --> (Payloads --> Instances --> NewEvents).
Does this present a concern for deadlocks, and if not, should we update the comment to reflect the new ordering?
There was a problem hiding this comment.
Hmm...good observation. Let me take a closer look at this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #178
This updates the SQL-based terminate logic to handle the case where users try to terminate scheduled orchestrations. We can't use the previous approach of sending an
ExecutionTerminatedmessage because DTFx doesn't know how to handle the case where this message is received and there is no orchestration state (you end up with a repeating NullReferenceException until the scheduled orchestration actually starts).This PR also includes an integration test for this scenario.