Skip to content

lock: allow unlock_one_safe to unlock same job #2121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
deepssin wants to merge 1 commit into from
Closed

lock: allow unlock_one_safe to unlock same job #2121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions teuthology/lock/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,11 @@ def unlock_one_safe(name: str, owner: str, run_name: str = "", job_id: str = "")
maybe_job = query.node_active_job(name, node_status)
if not maybe_job:
return unlock_one(name, owner, node_status["description"], node_status)
# if the active job matches the current run id, allow unlock (same job cleaning up)
if run_name and job_id and maybe_job.endswith(f"{run_name}/{job_id}"):
log.error(f"Refusing to unlock {name} since it has an active job: {run_name}/{job_id}")
return False
log.debug(f"Allowing unlock of {name} by same job: {run_name}/{job_id}")
return unlock_one(name, owner, node_status["description"], node_status)
# if there is a different active job, refuse to unlock
log.warning(f"Refusing to unlock {name} since it has an active job: {maybe_job}")
return False

Expand Down
Loading