move consumerset killing into stop

1 files changed, 5 insertions, 5 deletions

diff --git a/nova/service.py b/nova/service.py
index 141fd4253..782183322 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -175,11 +175,6 @@ class Service(object):
 
     def kill(self):
         """Destroy the service object in the datastore."""
-        self.csetthread.kill()
-        try:
-            self.csetthread.wait()
-        except greenlet.GreenletExit:
-            pass
         self.stop()
         try:
             db.service_destroy(context.get_admin_context(), self.service_id)
@@ -187,6 +182,11 @@ class Service(object):
             logging.warn(_('Service killed that has no database entry'))
 
     def stop(self):
+        self.csetthread.kill()
+        try:
+            self.csetthread.wait()
+        except greenlet.GreenletExit:
+            pass
         for x in self.timers:
             try:
                 x.stop()