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

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

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
34 changes: 23 additions & 11 deletions cylc/flow/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,12 +612,7 @@ async def start_scheduler(self):
raise exc from None

except (KeyboardInterrupt, asyncio.CancelledError, Exception) as exc:
try:
await self.shutdown(exc)
except Exception as exc2:
# In case of exceptions in the shutdown method itself
LOG.exception(exc2)
raise exc from None
await self.handle_exception(exc)

else:
# main loop ends (not used?)
Expand All @@ -644,8 +639,7 @@ async def run(self):
await self.start_servers()
await self.log_start()
except (KeyboardInterrupt, asyncio.CancelledError, Exception) as exc:
await self.shutdown(exc)
raise
await self.handle_exception(exc)
else:
# note start_scheduler handles its own shutdown logic
await self.start_scheduler()
Expand Down Expand Up @@ -1619,16 +1613,19 @@ async def shutdown(self, reason):

"""
if isinstance(reason, SchedulerStop):
LOG.info('Suite shutting down - %s', reason.args[0])
LOG.info(f'Suite shutting down - {reason.args[0]}')
elif isinstance(reason, SchedulerError):
LOG.error('Suite shutting down - %s', reason)
LOG.error(f'Suite shutting down - {reason}')
Copy link
Member

Choose a reason for hiding this comment

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

👍

elif isinstance(reason, SuiteConfigError):
LOG.error(f'{SuiteConfigError.__name__}: {reason}')
elif isinstance(reason, PlatformLookupError):
LOG.error(f'{PlatformLookupError.__name__}: {reason}')
else:
LOG.exception(reason)
LOG.critical('Suite shutting down - %s', reason)
if str(reason):
LOG.critical(f'Suite shutting down - {reason}')
else:
LOG.critical('Suite shutting down')

if self.proc_pool:
self.proc_pool.close()
Expand Down Expand Up @@ -1836,3 +1833,18 @@ def process_cylc_stop_point(self):
if stoppoint is not None:
self.options.stopcp = str(stoppoint)
self.pool.set_stop_point(get_point(self.options.stopcp))

async def handle_exception(self, exc):
"""Gracefully shut down the scheduler.

This re-raises the caught exception, to be caught higher up.

Args:
exc: The caught exception to be logged during the shutdown.
"""
try:
await self.shutdown(exc)
except Exception as exc2:
# In case of exceptions in the shutdown method itself
LOG.exception(exc2)
raise exc from None