Commit 2bc17331 authored by BAIRE Anthony's avatar BAIRE Anthony
Browse files

do not update sandbox state if ShuttingDown is raised

parent 194f06db
...@@ -317,6 +317,7 @@ class Manager: ...@@ -317,6 +317,7 @@ class Manager:
""" """
self._shutdown = asyncio.Future() self._shutdown = asyncio.Future()
self._shutdown.set_exception(ShuttingDown()) self._shutdown.set_exception(ShuttingDown())
self._shutdown.exception() # to avoid asyncio warnings
# cancel all 'next' tasks # cancel all 'next' tasks
for hnd in self._handles.values(): for hnd in self._handles.values():
if hnd.nxt is not None: if hnd.nxt is not None:
...@@ -724,6 +725,10 @@ EOF ...@@ -724,6 +725,10 @@ EOF
phase = "commit" phase = "commit"
yield from self._manage_commit(webapp, commit_versions) yield from self._manage_commit(webapp, commit_versions)
except ShuttingDown:
next_state = None
log.info("sandbox %r %s aborted (controller shutdown)", webapp.docker_name, phase)
except BaseException as e: except BaseException as e:
next_state = fail_state next_state = fail_state
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment