Fix LogsCheckpoint thread interrupt race condition#6939
Merged
Conversation
Check interrupt flag after await() returns and before calling saveFiles(), preventing the AWS SDK from seeing the interrupt flag and throwing AbortedException during S3 uploads at shutdown. Signed-off-by: Paolo Di Tommaso <[email protected]> Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]> Signed-off-by: Paolo Di Tommaso <[email protected]>
✅ Deploy Preview for nextflow-docs-staging ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
Member
|
I feel like we have iterated on this code a dozen times trying to find the right logic 😅 |
Member
jorgee
requested changes
Mar 23, 2026
jorgee
left a comment
Contributor
There was a problem hiding this comment.
The PR reduced the probability of the race condition but I think there is still a chance that the thread is interrupted during saving files. To fix it, we could add a synchronized block for handler.savefiles() and thread.interrupt() in onFlowComplete() and onFlowError().
Member
Author
|
Please do |
Signed-off-by: jorgee <[email protected]>
jorgee
approved these changes
Mar 23, 2026
jorgee
left a comment
Contributor
There was a problem hiding this comment.
Added a lock between interrupt and save files to ensure log checkpoint thread is never interrupted during handler.saveFiles().
pditommaso
added a commit
that referenced
this pull request
Mar 30, 2026
* Fix LogsCheckpoint thread interrupt race condition Check interrupt flag after await() returns and before calling saveFiles(), preventing the AWS SDK from seeing the interrupt flag and throwing AbortedException during S3 uploads at shutdown. Signed-off-by: Paolo Di Tommaso <[email protected]> Signed-off-by: jorgee <[email protected]> Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]> Co-authored-by: jorgee <[email protected]>
3 tasks
bentsherman
pushed a commit
that referenced
this pull request
May 21, 2026
* Fix LogsCheckpoint thread interrupt race condition Check interrupt flag after await() returns and before calling saveFiles(), preventing the AWS SDK from seeing the interrupt flag and throwing AbortedException during S3 uploads at shutdown. Signed-off-by: Paolo Di Tommaso <[email protected]> Signed-off-by: jorgee <[email protected]> Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]> Co-authored-by: jorgee <[email protected]>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Summary
LogsCheckpoint.run()wheresaveFiles()was called with the thread interrupt flag already set afterawait()caught anInterruptedExceptionAbortedException("Thread was interrupted") during S3 uploads at workflow shutdownawait()returns and beforesaveFiles(), so the loop exits cleanly on shutdownTest plan
AbortedExceptionwarnings in logs when running workflows with Tower/Seqera platform integration and remote work directory🤖 Generated with Claude Code