Skip to content

Fixes: #17950 - Handle InvalidJobOperation error in job enqueueing test #18062

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

Merged
merged 5 commits into from
Nov 21, 2024
Merged

Fixes: #17950 - Handle InvalidJobOperation error in job enqueueing test #18062

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb7c3eb
Wait until job1 exists in Redis before enqueueing job2
bctiemann Nov 21, 2024
aa9d4a1
Job can exist but not have status
bctiemann Nov 21, 2024
c14542c
Catch InvalidJobOperation and use as trigger for retry
bctiemann Nov 21, 2024
4595eaf
Catch InvalidJobOperation when deleting/canceling job
bctiemann Nov 21, 2024
d4fbce5
Remove testing code
bctiemann Nov 21, 2024
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
7 changes: 6 additions & 1 deletion netbox/core/models/jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from django.urls import reverse
from django.utils import timezone
from django.utils.translation import gettext as _
from rq.exceptions import InvalidJobOperation

from core.choices import JobStatusChoices
from core.models import ObjectType
Expand Down Expand Up @@ -158,7 +159,11 @@ def delete(self, *args, **kwargs):
job = queue.fetch_job(str(self.job_id))

if job:
job.cancel()
try:
job.cancel()
except InvalidJobOperation:
# Job may raise this exception from get_status() if missing from Redis
pass

def start(self):
"""
Expand Down