Revert changes to monkey_patch.

As a work-around to deal with bug 1075838, we modified
monkey_patch in the Cinder binaries.  The root cause of the
issue is/was actually a bug in eventlet but this was a quick
work-around.

Since the change Change-Id: I69ba75136e32e95c6fdf108f0c4fe21a5e3bdbe6
to do this landed, the problem has also been addressed in Keystone.

So, let's revert this patch to get back the greenthread performance
that we may have lost with this change.  For now, everything should
be addressed as long as we don't implement multi api worker in Cinder,
if we do and the evenlet fix hasn't been released we'll need to turn
the modification back on for bin/cinder-api.

Change-Id: Ie845bade85dbceacd91f15e082325602d9a79c74

diff --git a/bin/cinder-all b/bin/cinder-all
index 17cd5db7876e5e6ebe9a87515c57d478ac046870..e3c74eff8c412e41b5ddaf4a185f06d550a46bfd 100755 (executable)
--- a/bin/cinder-all
+++ b/bin/cinder-all
@@ -28,7 +28,7 @@ continue attempting to launch the rest of the services.
 """
 
 import eventlet
-eventlet.monkey_patch(os=False)
+eventlet.monkey_patch()
 
 import os
 import sys

diff --git a/bin/cinder-api b/bin/cinder-api
index 375c504a9a88450c748d9493f3261a2cd027470a..13c3db5112ec8a2fa2c7c37f7ec5286fa7fb4034 100755 (executable)
--- a/bin/cinder-api
+++ b/bin/cinder-api
@@ -19,8 +19,12 @@
 
 """Starter script for Cinder OS API."""
 
+# NOTE(jdg): If we port over multi worker code from Nova
+# we'll need to set monkey_patch(os=False), unless
+# eventlet is updated/released to fix the root issue
+
 import eventlet
-eventlet.monkey_patch(os=False)
+eventlet.monkey_patch()
 
 import os
 import sys

diff --git a/bin/cinder-scheduler b/bin/cinder-scheduler
index e473ab7163eef9cbd2e3870e7151c7231bf74895..33015b3cad81065a8bc454eb367f28b7aed27af3 100755 (executable)
--- a/bin/cinder-scheduler
+++ b/bin/cinder-scheduler
@@ -20,7 +20,7 @@
 """Starter script for Cinder Scheduler."""
 
 import eventlet
-eventlet.monkey_patch(os=False)
+eventlet.monkey_patch()
 
 import gettext
 import os

diff --git a/bin/cinder-volume b/bin/cinder-volume
index 8fa6134136f2b7dc5bf5db4dbd7652497285b90f..47db9518aba289ad036ac6395b8b085c73020e7f 100755 (executable)
--- a/bin/cinder-volume
+++ b/bin/cinder-volume
@@ -20,7 +20,7 @@
 """Starter script for Cinder Volume."""
 
 import eventlet
-eventlet.monkey_patch(os=False)
+eventlet.monkey_patch()
 
 import os
 import sys