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
This commit is contained in:
John Griffith 2012-11-28 12:19:14 -07:00
parent 79e0052e79
commit 44a2b8949f
4 changed files with 8 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -20,7 +20,7 @@
"""Starter script for Cinder Scheduler."""
import eventlet
eventlet.monkey_patch(os=False)
eventlet.monkey_patch()
import gettext
import os

View File

@ -20,7 +20,7 @@
"""Starter script for Cinder Volume."""
import eventlet
eventlet.monkey_patch(os=False)
eventlet.monkey_patch()
import os
import sys