hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-15 14:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

return future from stop_single_user

Browse Source 
allows chaining actions when stop finally resolves via `spawner._stop_future`
This commit is contained in:
Min RK
2018-09-18 12:44:45 +02:00
parent 81a410db91
commit 0fb78f19ec
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jupyterhub/handlers/base.py
View File

@@ -3,6 +3,7 @@
# Copyright (c) Jupyter Development Team. # Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License. # Distributed under the terms of the Modified BSD License.
import asyncio
import copy import copy
from datetime import datetime, timedelta from datetime import datetime, timedelta
from http.client import responses from http.client import responses
@@ -878,18 +879,25 @@ class BaseHandler(RequestHandler):
await self.proxy.delete_user(user, server_name) await self.proxy.delete_user(user, server_name)
await user.stop(server_name) await user.stop(server_name)
finally: finally:
spawner._stop_future = None
spawner._stop_pending = False spawner._stop_pending = False
toc = IOLoop.current().time() toc = IOLoop.current().time()
self.log.info("User %s server took %.3f seconds to stop", user.name, toc - tic) self.log.info("User %s server took %.3f seconds to stop", user.name, toc - tic)
self.statsd.timing('spawner.stop', (toc - tic) * 1000) self.statsd.timing('spawner.stop', (toc - tic) * 1000)
RUNNING_SERVERS.dec() RUNNING_SERVERS.dec()
future = spawner._stop_future = asyncio.ensure_future(stop())
try: try:
await gen.with_timeout(timedelta(seconds=self.slow_stop_timeout), stop()) await gen.with_timeout(timedelta(seconds=self.slow_stop_timeout), future)
except gen.TimeoutError: except gen.TimeoutError:
# hit timeout, but stop is still pending # hit timeout, but stop is still pending
self.log.warning("User %s:%s server is slow to stop", user.name, server_name) self.log.warning("User %s:%s server is slow to stop", user.name, server_name)
# return handle on the future for hooking up callbacks
return future
#--------------------------------------------------------------- #---------------------------------------------------------------
# template rendering # template rendering
#--------------------------------------------------------------- #---------------------------------------------------------------