From 44a2b8949fba07d9a3427137d59fe81fafbc3458 Mon Sep 17 00:00:00 2001
From: John Griffith <john.griffith@solidfire.com>
Date: Wed, 28 Nov 2012 12:19:14 -0700
Subject: [PATCH] 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
---
 bin/cinder-all       | 2 +-
 bin/cinder-api       | 6 +++++-
 bin/cinder-scheduler | 2 +-
 bin/cinder-volume    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bin/cinder-all b/bin/cinder-all
index 17cd5db7876..e3c74eff8c4 100755
--- 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 375c504a9a8..13c3db5112e 100755
--- 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 e473ab7163e..33015b3cad8 100755
--- 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 8fa6134136f..47db9518aba 100755
--- 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