← Back to branch summary

~vishvananda/nova/no-db-messaging

« back to all changes in this revision

Viewing changes to nova/service.py

  • Committer: termie
  • Author(s): Vishvananda Ishaya
  • Date: 2011-05-19 01:47:38 UTC
  • Revision ID: github@anarkystic.com-20110519014738-wl26m12d8qvz1rfl
fix consumers to actually be deleted and clean up cloud test

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/service.py
21
21
 
22
22
import inspect
23
23
import os
24
 
import sys
25
 
import time
26
24
 
27
 
from eventlet import event
28
25
from eventlet import greenthread
29
 
from eventlet import greenpool
30
26
 
31
27
from nova import context
32
28
from nova import db
112
108
                        consumer_node,
113
109
                        fanout])
114
110
            # Wait forever, processing these consumers
115
 
            greenthread.spawn_n(cset.wait)
 
111
            self.csetthread = greenthread.spawn(cset.wait)
116
112
 
117
113
            pulse = utils.LoopingCall(self.report_state)
118
114
            pulse.start(interval=self.report_interval, now=False)
169
165
 
170
166
    def kill(self):
171
167
        """Destroy the service object in the datastore."""
 
168
        self.csetthread.kill()
 
169
        self.csetthread.wait()
172
170
        self.stop()
173
171
        try:
174
172
            db.service_destroy(context.get_admin_context(), self.service_id)