From 75289d50c0d8c17176fd9ed0bc960b18fd67f6a3 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 29 Aug 2024 17:03:20 -0600 Subject: [PATCH] lock: Avoid querying paddles for non-jobs 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 --- teuthology/lock/query.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/teuthology/lock/query.py b/teuthology/lock/query.py index 162f38572..752eac106 100644 --- a/teuthology/lock/query.py +++ b/teuthology/lock/query.py @@ -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.