From 3c132c028a089936eb205079ad239347bc1a0dd9 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 2 May 2013 09:44:30 +0100 Subject: Copy Nova's workaround for RHEL6 eventlet issue The eventlet on PyPI basically doesn't work on RHEL because we (Red Hat) screwed up by not taking monkey patching into account when backporting an API from python 3. This is the series of events: 1) We backported a patch to RHEL6 from Python 3 which added an optional 'timeout' argument to subprocess.Popen: http://pkgs.devel.redhat.com/cgit/rpms/python/commit/?h=rhel-6.3&id=fc9a3f0e07 This might sound innocuous but it means the wait() function get called with a timeout argument 2) eventlet overrides this function, but doesn't know about the timeout argument, so it fails. To reproduce, try applying this to your python 2.7: https://gist.github.com/markmc/5500967 3) eventlet doesn't yet support Python 3, so the only time this issue crops up is if you use eventlet on RHEL6 4) We've fixed eventlet in EPEL6, but the issue still remains if you install eventlet from upstream 5) Dave Malcolm sent a pull request to eventlet, but it has stalled: https://bitbucket.org/eventlet/eventlet/pull-request/30/add-dummy-timeout-parameter-to Nova has long had a nasty workaround to patch eventlet in our virtualenv and we now need this workaround in oslo-incubator to test processutils. Let's add it here and make nova sync it from oslo-incubator. I really hope we can get eventlet upstream "fixed" and the fix released soon. When that happens, we can kill all this nastiness. Change-Id: I62ce43a330d7ae94eda4c7498782a655e63747fa --- contrib/redhat-eventlet.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 contrib/redhat-eventlet.patch (limited to 'contrib') diff --git a/contrib/redhat-eventlet.patch b/contrib/redhat-eventlet.patch new file mode 100644 index 0000000..cf2ff53 --- /dev/null +++ b/contrib/redhat-eventlet.patch @@ -0,0 +1,16 @@ +--- .nova-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py.orig +2011-05-25 +23:31:34.597271402 +0000 ++++ .nova-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py +2011-05-25 +23:33:24.055602468 +0000 +@@ -32,7 +32,7 @@ + setattr(self, attr, wrapped_pipe) + __init__.__doc__ = subprocess_orig.Popen.__init__.__doc__ + +- def wait(self, check_interval=0.01): ++ def wait(self, check_interval=0.01, timeout=None): + # Instead of a blocking OS call, this version of wait() uses logic + # borrowed from the eventlet 0.2 processes.Process.wait() method. + try: + -- cgit