Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix failure to shutdown on keyboard interrupt #3982

Merged
merged 3 commits into from
Dec 7, 2020
Merged

Fix failure to shutdown on keyboard interrupt #3982

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dabada8
Fix failure to shutdown on keyboard interrupt
MetRonnie Dec 7, 2020
d0e5dd2
Update changelog
MetRonnie Dec 7, 2020
7cfb0ec
Ensure any exceptions are logged properly in scheduler.run()
MetRonnie Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cylc/flow/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ async def start_scheduler(self):
await self.shutdown(exc)
raise exc from None

except Exception as exc:
except (KeyboardInterrupt, asyncio.CancelledError, Exception) as exc:
try:
await self.shutdown(exc)
except Exception as exc2:
Expand Down Expand Up @@ -643,7 +643,7 @@ async def run(self):
await self.configure()
await self.start_servers()
await self.log_start()
except Exception as exc:
except (KeyboardInterrupt, asyncio.CancelledError, Exception) as exc:
await self.shutdown(exc)
Copy link
Member

@oliver-sanders oliver-sanders Dec 7, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might want to copy over the try/except to ensure that shutdown traceback gets dumped to the flow log if not handled by scheduler_cli.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MetRonnie two approvals, but will let you reply this one before I merge it (happy if you or @oliver-sanders merge it after you've taken a look on this one too 👍 )

raise
else:
Expand Down
8 changes: 1 addition & 7 deletions cylc/flow/scheduler_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,13 +406,7 @@ async def _run(parser, options, reg, is_restart, scheduler):
# stop cylc stop
except SchedulerError:
ret = 1
except KeyboardInterrupt as exc:
try:
await scheduler.shutdown(exc)
except Exception as exc2:
# In case of exceptions in the shutdown method itself.
LOG.exception(exc2)
raise exc2 from None
Comment on lines -409 to -415
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for this anymore as the shutdown is handled in scheduler.run() or scheduler.start_scheduler()

except (KeyboardInterrupt, asyncio.CancelledError):
ret = 2
except Exception:
ret = 3
Expand Down