zuul/nodepool
Code Issues Proposed changes

Merge "Fix UnboundLocalError in error handling of runStateMachine"

Browse Source
This commit is contained in:
Zuul 2023-11-20 15:27:35 +00:00 committed by Gerrit Code Review
commit 28d36ad5a5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nodepool/driver/statemachine.py
View File

@ -295,16 +295,16 @@ class StateMachineNodeLauncher(stats.StatsReporter):
"Lost ZooKeeper session trying to launch for node %s", "Lost ZooKeeper session trying to launch for node %s",
node.id) node.id)
node.state = zk.FAILED node.state = zk.FAILED
if state_machine: if self.state_machine:
node.external_id = state_machine.external_id node.external_id = self.state_machine.external_id
statsd_key = 'error.zksession' statsd_key = 'error.zksession'
self.manager.nodescan_worker.removeRequest(self.nodescan_request) self.manager.nodescan_worker.removeRequest(self.nodescan_request)
self.nodescan_request = None self.nodescan_request = None
except exceptions.QuotaException: except exceptions.QuotaException:
self.log.info("Aborting node %s due to quota failure", node.id) self.log.info("Aborting node %s due to quota failure", node.id)
node.state = zk.ABORTED node.state = zk.ABORTED
if state_machine: if self.state_machine:
node.external_id = state_machine.external_id node.external_id = self.state_machine.external_id
self.zk.storeNode(node) self.zk.storeNode(node)
statsd_key = 'error.quota' statsd_key = 'error.quota'
self.manager.invalidateQuotaCache() self.manager.invalidateQuotaCache()
@ -313,11 +313,11 @@ class StateMachineNodeLauncher(stats.StatsReporter):
except Exception as e: except Exception as e:
self.log.exception("Launch attempt %d/%d for node %s, failed:", self.log.exception("Launch attempt %d/%d for node %s, failed:",
self.attempts, self.retries, node.id) self.attempts, self.retries, node.id)
if state_machine and state_machine.external_id: if self.state_machine and self.state_machine.external_id:
# If we're deleting, don't overwrite the node external # If we're deleting, don't overwrite the node external
# id, because we may make another delete state machine # id, because we may make another delete state machine
# below. # below.
node.external_id = state_machine.external_id node.external_id = self.state_machine.external_id
self.zk.storeNode(node) self.zk.storeNode(node)
if hasattr(e, 'statsd_key'): if hasattr(e, 'statsd_key'):