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

fix: Duplicate scheduled jobs run forever (#26565)

Browse source 
If same method is added in multiple places our code just finds 1 random
scheduled job type and updates it as "ran", in some unlucky situations
this behaviour won't be random and always run one and update another so
the job never gets marked as "ran" and keeps running on every tick.
This commit is contained in:
Ankush Menat 2024-05-26 12:19:20 +05:30 • committed by GitHub
parent d18f743d39
commit 43c8ae0049
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
View file

@ -71,8 +71,9 @@ class ScheduledJobType(Document):
enqueue(
"frappe.core.doctype.scheduled_job_type.scheduled_job_type.run_scheduled_job",
queue=self.get_queue_name(),
job_type=self.method,
job_type=self.method, # Not actually used, kept for logging
job_id=self.rq_job_id,
scheduled_job_type=self.name,
)
return True
else:
@ -93,7 +94,7 @@ class ScheduledJobType(Document):
@property
def rq_job_id(self):
"""Unique ID created to deduplicate jobs with single RQ call."""
return f"scheduled_job::{self.method}"
return f"scheduled_job::{self.name}"
@property
def next_execution(self):
@ -188,10 +189,10 @@ def execute_event(doc: str):
return doc
def run_scheduled_job(job_type: str):
def run_scheduled_job(scheduled_job_type: str, job_type: str | None = None):
"""This is a wrapper function that runs a hooks.scheduler_events method"""
try:
frappe.get_doc("Scheduled Job Type", dict(method=job_type)).execute()
frappe.get_doc("Scheduled Job Type", scheduled_job_type).execute()
except Exception:
print(frappe.get_traceback())