update cancellation sample #276
Open
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
cretz
reviewed
May 11, 2023
cancellation/activity.go
Outdated
| @@ -21,7 +21,7 @@ func (a *Activities) ActivityToBeCanceled(ctx context.Context) (string, error) { | |||
| activity.RecordHeartbeat(ctx, "") | |||
| case <-ctx.Done(): | |||
| logger.Info("context is cancelled") | |||
| return "I am canceled by Done", nil | |||
| return "I am canceled by Done", ctx.Err() | |||
There was a problem hiding this comment.
No reason to return a value if you're returning cancellation
cancellation/workflow.go
Outdated
| }() | ||
|
|
||
| var result string | ||
| err := workflow.ExecuteActivity(ctx, a.ActivityToBeCanceled).Get(ctx, &result) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| logger.Info(fmt.Sprintf("ActivityToBeCanceled returns %v, %v", result, err)) |
There was a problem hiding this comment.
No reason to log an error you know is nil
cretz
reviewed
May 11, 2023
cancellation/workflow.go
Outdated
Comment on lines
42
to
43
| err = workflow.ExecuteActivity(ctx, a.ActivityToBeSkipped).Get(ctx, nil) | ||
| logger.Error("Error from ActivityToBeSkipped", "Error", err) |
There was a problem hiding this comment.
The original purpose of this sample was to show that this is skipped because the context is already cancelled. Now that we return early unlike before, this is essentially unreachable code. Do you want to remove it?
There was a problem hiding this comment.
done, also added cleanup activity specific activity options (as it can fail heartbeat timeout, and its not heartbeating anyways)
Signed-off-by: Tihomir Surdilovic <[email protected]>
Signed-off-by: Tihomir Surdilovic <[email protected]>
Signed-off-by: Tihomir Surdilovic <[email protected]>
tsurdilo
force-pushed
the
upcancellationsample
branch
from
a33890b
to
2429adb
Compare
cretz
approved these changes
May 12, 2023
| logger.Error("Error from ActivityToBeSkipped", "Error", err) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| logger.Info("Workflow Execution complete.") |
There was a problem hiding this comment.
Unreachable code, but in this case I think it's fine
Quinn-With-Two-Ns
approved these changes
May 15, 2023
|
@tsurdilo did you want to merge 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.
Updates cancellation sample: