Merge "Fix race when canceling a node request"
This commit is contained in:
commit
30a66d4db0
|
@ -143,10 +143,10 @@ class Nodepool(object):
|
||||||
log.info("Canceling node request %s", request)
|
log.info("Canceling node request %s", request)
|
||||||
if not request.canceled:
|
if not request.canceled:
|
||||||
try:
|
try:
|
||||||
|
request.canceled = True
|
||||||
self.zk_nodepool.deleteNodeRequest(request)
|
self.zk_nodepool.deleteNodeRequest(request)
|
||||||
except Exception:
|
except Exception:
|
||||||
log.exception("Error deleting node request:")
|
log.exception("Error deleting node request:")
|
||||||
request.canceled = True
|
|
||||||
|
|
||||||
def reviseRequest(self, request, relative_priority=None):
|
def reviseRequest(self, request, relative_priority=None):
|
||||||
'''Attempt to update the node request, if it is not currently being
|
'''Attempt to update the node request, if it is not currently being
|
||||||
|
|
Loading…
Reference in New Issue