Skip to content

Commit

Permalink
lock: Avoid querying paddles for non-jobs
Browse files Browse the repository at this point in the history
When we encounter a node that's locked with a description that doesn't look
like it points to a job, avoid the inevitable 404 we'd get from paddles. Without
this, the cleanup process gets short-circuited.

Signed-off-by: Zack Cerza <[email protected]>
  • Loading branch information
zmc committed Aug 29, 2024
1 parent 3752d38 commit 75289d5
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions teuthology/lock/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ def node_active_job(name: str, status: Union[dict, None] = None) -> Union[str, N
# This should never happen with a normal node
return "node had no status"
description = status['description']
if '/' not in description:
# technically not an "active job", but someone locked the node
# for a different purpose and is likely still using it.
return description
(run_name, job_id) = description.split('/')[-2:]
if not run_name or job_id == '':
# We thought this node might have a stale job, but no.
Expand Down

0 comments on commit 75289d5

Please sign in to comment.