From b944677f8524ec8708a396de20e3fc17850c15c5 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 29 Jan 2014 22:08:48 -0500 Subject: [PATCH] Fix ipmi events if pyghmi spins in an eventloop If circumstances inside pyghmi cause it to be looping in an event loop, confluent was getting work done, but the code to wake up the eventlet greenthreads wouldn't get tickled. Address this by also waking up waiters in the function that is invited to the pyghmi event loop party. --- plugins/hardwaremanagement/ipmi.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/hardwaremanagement/ipmi.py b/plugins/hardwaremanagement/ipmi.py index 81bbdc33..1efd144f 100644 --- a/plugins/hardwaremanagement/ipmi.py +++ b/plugins/hardwaremanagement/ipmi.py @@ -67,7 +67,12 @@ def _process_chgs(intline): except: # assure the thread does not crash and burn import sys print sys.exc_info()[2] - + # If we are inside a loop within pyghmi, this is our only shot + # so we have to wake up anything that might be interested in + # state changes here as well as the evtloop + while ipmiwaiters: + waiter = ipmiwaiters.popleft() + waiter.send() def get_conn_params(node, configdata):