From: Tim Serong <tserong@suse.com>
Date: Mon, 8 May 2017 13:03:55 +0000 (+1000)
Subject: pybind/mgr/rest: completely terminate cherrypy in shutdown
X-Git-Tag: v12.0.3~63^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14995%2Fhead;p=ceph.git

pybind/mgr/rest: completely terminate cherrypy in shutdown

cherrypy.engine.stop() doesn't actually completely kill cherrypy,
which means cherrypy.engine.block() never returns, so this module's
thread never completes cleanly.

Signed-off-by: Tim Serong <tserong@suse.com>
---

diff --git a/src/pybind/mgr/rest/module.py b/src/pybind/mgr/rest/module.py
index f72b7ce30e4..77a38f54d6e 100644
--- a/src/pybind/mgr/rest/module.py
+++ b/src/pybind/mgr/rest/module.py
@@ -156,7 +156,7 @@ class Module(MgrModule):
         return [self._auth_cls()]
 
     def shutdown(self):
-        cherrypy.engine.stop()
+        cherrypy.engine.exit()
 
     def serve(self):
         self.keys = self._load_keys()