engine : remove GreenletExit workaround
Both heat and oslo now require the version of greenlet containing the fix (greenlet>=0.3.2) so we no longer need this workaround Change-Id: I42af8e020f08480dda08f4b4879c2840e741ea59
This commit is contained in:
parent
9db6e2a77f
commit
56d5fb9f83
@ -15,7 +15,6 @@
|
|||||||
|
|
||||||
import base64
|
import base64
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from eventlet.support import greenlets as greenlet
|
|
||||||
|
|
||||||
from heat.engine import event
|
from heat.engine import event
|
||||||
from heat.common import exception
|
from heat.common import exception
|
||||||
@ -337,14 +336,6 @@ class Resource(object):
|
|||||||
yield
|
yield
|
||||||
while not self.check_create_complete(create_data):
|
while not self.check_create_complete(create_data):
|
||||||
yield
|
yield
|
||||||
except greenlet.GreenletExit:
|
|
||||||
# Older versions of greenlet erroneously had GreenletExit inherit
|
|
||||||
# from Exception instead of BaseException
|
|
||||||
with excutils.save_and_reraise_exception():
|
|
||||||
try:
|
|
||||||
self.state_set(self.CREATE_FAILED, 'Creation aborted')
|
|
||||||
except Exception:
|
|
||||||
logger.exception('Error marking resource as failed')
|
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
logger.exception('create %s', str(self))
|
logger.exception('create %s', str(self))
|
||||||
failure = exception.ResourceFailure(ex)
|
failure = exception.ResourceFailure(ex)
|
||||||
|
Loading…
Reference in New Issue
Block a user