summaryrefslogtreecommitdiff
path: root/swift/obj/updater.py
diff options
context:
space:
mode:
authorDmitriy Ukhlov <dukhlov@mirantis.com>2016-04-08 16:00:16 +0300
committerDmitriy Ukhlov <dukhlov@mirantis.com>2016-04-15 14:04:12 +0000
commit746d928a875281a7154dcd438f46a58bbf656db9 (patch)
tree735902ecb8d9c5de79ef853df77088589ffcccb4 /swift/obj/updater.py
parenta057c409ec8a23290bc72c4fa45d55a1178f4828 (diff)
downloadswift-746d928a875281a7154dcd438f46a58bbf656db9.tar.gz
Adds eventlet monkey patching of select module if thread is pathed
Oslo.messaging pika driver requires patching of select module if thread is patched. Pika driver uses select call and if it is not patched onsuming messages blocks whole eventlet loop Closes-Bug: #1570242 Change-Id: I9756737309f401ebddb7475eb84725f65bca01bf
Diffstat (limited to 'swift/obj/updater.py')
-rw-r--r--swift/obj/updater.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/swift/obj/updater.py b/swift/obj/updater.py
index 87c21c397..9bf4ef19a 100644
--- a/swift/obj/updater.py
+++ b/swift/obj/updater.py
@@ -94,7 +94,8 @@ class ObjectUpdater(Daemon):
pids.append(pid)
else:
signal.signal(signal.SIGTERM, signal.SIG_DFL)
- patcher.monkey_patch(all=False, socket=True, thread=True)
+ patcher.monkey_patch(all=False, socket=True, select=True,
+ thread=True)
self.successes = 0
self.failures = 0
forkbegin = time.time()