zuul/nodepool
Code Issues Proposed changes

Merge "Add extra safety to metastatic bnr cleanup"

Browse Source
This commit is contained in:
Zuul 2024-08-28 21:05:06 +00:00 committed by Gerrit Code Review
commit 1c3cd06e99
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nodepool/driver/metastatic/adapter.py
View File

@ -321,10 +321,18 @@ class MetastaticAdapter(statemachine.Adapter):
self.log.info("Backing node %s has been idle for " self.log.info("Backing node %s has been idle for "
"%s seconds, releasing", "%s seconds, releasing",
bnr.node_id, now - bnr.last_used) bnr.node_id, now - bnr.last_used)
# Set the bnr to failed just in case something
# goes wrong after this point, we won't use it
# any more.
bnr.failed = True
node = self._getNode(bnr.node_id) node = self._getNode(bnr.node_id)
node.state = zk.USED if node:
self.zk.storeNode(node) # In case the node was already removed due
self.zk.forceUnlockNode(node) # to an error, allow the bnr to still be
# cleaned up.
node.state = zk.USED
self.zk.storeNode(node)
self.zk.forceUnlockNode(node)
backing_node_records.remove(bnr) backing_node_records.remove(bnr)
return [] return []