openstack/cinder
Code Issues Proposed changes

Merge "Propoerly call oslo's Service stop and wait"

Browse Source
This commit is contained in:
Jenkins 2016-02-29 10:29:23 +00:00 committed by Gerrit Code Review
commit 4d093d4eca
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/service.py
View File

@ -283,7 +283,7 @@ class Service(service.Service):
x.stop() x.stop()
except Exception: except Exception:
self.timers_skip.append(x) self.timers_skip.append(x)
super(Service, self).stop() super(Service, self).stop(graceful=True)
def wait(self): def wait(self):
skip = getattr(self, 'timers_skip', []) skip = getattr(self, 'timers_skip', [])
@ -295,6 +295,7 @@ class Service(service.Service):
pass pass
if self.rpcserver: if self.rpcserver:
self.rpcserver.wait() self.rpcserver.wait()
super(Service, self).wait()
def periodic_tasks(self, raise_on_error=False): def periodic_tasks(self, raise_on_error=False):
"""Tasks to be run at a periodic interval.""" """Tasks to be run at a periodic interval."""