openstack/mistral
Code Issues Proposed changes

Merge "Use eventlet-aware threading events"

Browse Source
This commit is contained in:
Zuul 2019-06-18 06:35:20 +00:00 committed by Gerrit Code Review
commit 66cab33a99
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lower-constraints.txt
View File

@ -80,7 +80,7 @@ oslo.middleware==3.31.0
oslo.policy==1.30.0 oslo.policy==1.30.0
oslo.serialization==2.18.0 oslo.serialization==2.18.0
oslo.service==1.24.0 oslo.service==1.24.0
oslo.utils==3.33.0 oslo.utils==3.37.0
oslosphinx==4.7.0 oslosphinx==4.7.0
oslotest==3.2.0 oslotest==3.2.0
osprofiler==1.4.0 osprofiler==1.4.0

3
mistral/rpc/kombu/kombu_listener.py
View File

@ -19,6 +19,7 @@ import six
import threading import threading
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import eventletutils
from mistral.rpc.kombu import base as kombu_base from mistral.rpc.kombu import base as kombu_base
@ -34,7 +35,7 @@ class KombuRPCListener(ConsumerMixin):
self._thread = None self._thread = None
self.connection = six.next(self._connections) self.connection = six.next(self._connections)
self.ready = threading.Event() self.ready = eventletutils.Event()
def add_listener(self, correlation_id): def add_listener(self, correlation_id):
self._results[correlation_id] = six.moves.queue.Queue() self._results[correlation_id] = six.moves.queue.Queue()

5
mistral/rpc/kombu/kombu_server.py
View File

@ -20,6 +20,7 @@ import time
import kombu import kombu
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import eventletutils
from stevedore import driver from stevedore import driver
from mistral import context as auth_ctx from mistral import context as auth_ctx
@ -68,8 +69,8 @@ class KombuRPCServer(rpc_base.RPCServer, kombu_base.Base):
self.routing_key = self.topic self.routing_key = self.topic
self.channel = None self.channel = None
self.conn = None self.conn = None
self._running = threading.Event() self._running = eventletutils.Event()
self._stopped = threading.Event() self._stopped = eventletutils.Event()
self.endpoints = [] self.endpoints = []
self._worker = None self._worker = None
self._thread = None self._thread = None

2
requirements.txt
View File

@ -24,7 +24,7 @@ oslo.i18n>=3.15.3 # Apache-2.0
oslo.messaging>=5.29.0 # Apache-2.0 oslo.messaging>=5.29.0 # Apache-2.0
oslo.middleware>=3.31.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0
oslo.policy>=1.30.0 # Apache-2.0 oslo.policy>=1.30.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0 oslo.utils>=3.37.0 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 oslo.service!=1.28.1,>=1.24.0 # Apache-2.0