vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: handle expired jobs while deduping (#31803)

Browse source 
* fix: Race condition between job fetch and expiry

* fix: don't refetch status
This commit is contained in:
Ankush Menat 2025-03-19 18:20:07 +05:30 • committed by GitHub
parent 6be2ada30c
commit acbac07d01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/utils/background_jobs.py
View file

@ -16,7 +16,7 @@ import setproctitle
from redis.exceptions import BusyLoadingError, ConnectionError
from rq import Callback, Queue, Worker
from rq.defaults import DEFAULT_WORKER_TTL
from rq.exceptions import NoSuchJobError
from rq.exceptions import InvalidJobOperation, NoSuchJobError
from rq.job import Job, JobStatus
from rq.logutils import setup_loghandlers
from rq.timeouts import JobTimeoutException
@ -114,7 +114,7 @@ def enqueue(
if not job_id:
frappe.throw(_("`job_id` paramater is required for deduplication."))
job = get_job(job_id)
if job and job.get_status() in (JobStatus.QUEUED, JobStatus.STARTED):
if job and job.get_status(refresh=False) in (JobStatus.QUEUED, JobStatus.STARTED):
frappe.logger().debug(f"Not queueing job {job.id} because it is in queue already")
return
elif job:
@ -672,13 +672,13 @@ def is_job_enqueued(job_id: str) -> bool:
def get_job_status(job_id: str) -> JobStatus | None:
"""Get RQ job status, returns None if job is not found."""
if job := get_job(job_id):
return job.get_status()
return job.get_status(refresh=False)
def get_job(job_id: str) -> Job | None:
try:
return Job.fetch(create_job_id(job_id), connection=get_redis_conn())
except NoSuchJobError:
except (NoSuchJobError, InvalidJobOperation):
return None