-
Notifications
You must be signed in to change notification settings - Fork 195
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.
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
Fix monitoring ctrlc hang #1670
Merged
Merged
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
a1672a2
add a timeout to monitoring dfk channel
ZhuozhaoLi 159337b
monitoring database logs workflow completion time when exiting abnorm…
ZhuozhaoLi 8c305f7
remove a line that sets workflow_end attribute
ZhuozhaoLi eafbb64
remove one unused exception e
ZhuozhaoLi 88a446f
Merge branch 'master' into fix_monitoring_ctrlc_hang
ZhuozhaoLi 2229f64
catch KeyboardInterrupt exception and raise to the upper level in db_…
ZhuozhaoLi 6faf49a
raise KeyboardInterrupt exception in dbm_starter
ZhuozhaoLi ffcdcbe
rename workflow_message and change code sytle
ZhuozhaoLi 859b1c2
Merge branch 'fix_monitoring_ctrlc_hang' of github.com:Parsl/parsl in…
ZhuozhaoLi 6879691
increase timeout and better exception text
ZhuozhaoLi aa20379
change f string to format
ZhuozhaoLi ecc8d4c
separate keyboardinterrupt and other exceptions in db_manager
ZhuozhaoLi 2396072
do not re-raise exceptions in _insert and _update
ZhuozhaoLi dc4512f
Merge branch 'master' into fix_monitoring_ctrlc_hang
ZhuozhaoLi f0558e5
Merge branch 'master' into fix_monitoring_ctrlc_hang
yadudoc 4292374
Merge branch 'master' into fix_monitoring_ctrlc_hang
benclifford File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
_insert and _update now pass on database errors to their caller, rather than absorbing them.
So probably the caller (the main loop process) now needs to deal with non-KeyboardInterrupt exceptions that might occur. Or, the _insert and _update code should only re-raise KeyboardInterrupt exceptions to preserve previous behaviour.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am choosing the later approach: raise KeyboardInterrupt exceptions in
_insert
and_update
code. I think for exceptions other than KeyboardInterrupt, we should re-raise too since the db is missing some messages at that point, no?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the behaviour in master is to ignore most exceptions at the top level, and then carry on the main loop receiving and processing messages. I think this PR should not change that behaviour.
It would be worth investigating separately though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that makes sense. thanks