openstack/octavia
Code Issues Proposed changes

Merge "Shutdown a endpoint workers executor on termination"

Browse Source
This commit is contained in:
Jenkins 2017-05-03 21:58:54 +00:00 committed by Gerrit Code Review
commit 7829ed96f6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
octavia/controller/queue/consumer.py
View File

@ -30,7 +30,7 @@ class ConsumerService(cotyledon.Service):
self.conf = conf self.conf = conf
self.topic = conf.oslo_messaging.topic self.topic = conf.oslo_messaging.topic
self.server = conf.host self.server = conf.host
self.endpoints = [endpoint.Endpoint()] self.endpoints = []
self.access_policy = dispatcher.DefaultRPCAccessPolicy self.access_policy = dispatcher.DefaultRPCAccessPolicy
self.message_listener = None self.message_listener = None
@ -39,6 +39,7 @@ class ConsumerService(cotyledon.Service):
transport = messaging.get_transport(self.conf) transport = messaging.get_transport(self.conf)
target = messaging.Target(topic=self.topic, server=self.server, target = messaging.Target(topic=self.topic, server=self.server,
fanout=False) fanout=False)
self.endpoints = [endpoint.Endpoint()]
self.message_listener = messaging.get_rpc_server( self.message_listener = messaging.get_rpc_server(
transport, target, self.endpoints, transport, target, self.endpoints,
executor='threading', access_policy=self.access_policy) executor='threading', access_policy=self.access_policy)
@ -53,4 +54,11 @@ class ConsumerService(cotyledon.Service):
_LI('Consumer successfully stopped. Waiting for final ' _LI('Consumer successfully stopped. Waiting for final '
'messages to be processed...')) 'messages to be processed...'))
self.message_listener.wait() self.message_listener.wait()
if self.endpoints:
LOG.info(_LI('Shutting down endpoint worker executors...'))
for e in self.endpoints:
try:
e.worker.executor.shutdown()
except AttributeError:
pass
super(ConsumerService, self).terminate() super(ConsumerService, self).terminate()