openstack/oslo.messaging
Code Issues Proposed changes

Merge "Disable greenthreads for RabbitDriver "listen" connections" into stable/2023.1

Browse Source
This commit is contained in:
Zuul 2023-09-14 04:54:02 +00:00 committed by Gerrit Code Review
commit b8b4375885
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oslo_messaging/_drivers/impl_rabbit.py
View File

@ -651,6 +651,8 @@ class Connection(object):
# if it was already monkey patched by eventlet/greenlet.
global threading
threading = _utils.stdlib_threading
amqpdriver.threading = _utils.stdlib_threading
amqpdriver.queue = _utils.stdlib_queue
self.direct_mandatory_flag = driver_conf.direct_mandatory_flag

3
oslo_messaging/_utils.py
View File

@ -14,6 +14,7 @@
# under the License.
import logging
import queue
import threading
from oslo_utils import eventletutils
@ -26,12 +27,14 @@ if eventlet and eventletutils.is_monkey_patched("thread"):
# Here we initialize module with the native python threading module
# if it was already monkey patched by eventlet/greenlet.
stdlib_threading = eventlet.patcher.original('threading')
stdlib_queue = eventlet.patcher.original('queue')
else:
# Manage the case where we run this driver in a non patched environment
# and where user even so configure the driver to run heartbeat through
# a python thread, if we don't do that when the heartbeat will start
# we will facing an issue by trying to override the threading module.
stdlib_threading = threading
stdlib_queue = queue
def version_is_compatible(imp_version, version):