Merge branch 'main' into main

chrisguidry · web-flow · commit ba46d49932e8 · 2025-02-21T12:20:43.000-05:00
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,13 @@
 History
 -------
 
+v0.26.3 (2025-01-06)
+....................
+
+* Fix negative expires_ms and avoid worker freezing while using cron by @Matvey-Kuk in #479
+* Fix race condition on task retry by @RB387 in #487
+
+
 v0.26.1 (2023-08-29)
 ....................
 
diff --git a/arq/version.py b/arq/version.py
@@ -1,2 +1,2 @@
 # Version here is used for the package version via the `[tool.hatch.version]` section of `pyproject.toml`.
-VERSION = '0.26.1'
+VERSION = '0.26.3'
diff --git a/arq/worker.py b/arq/worker.py
@@ -960,7 +960,12 @@ async def run_cron(self, n: datetime, delay: float, num_windows: int = 2) -> Non
                     job_id = f'{cron_job.name}:{to_unix_ms(cron_job.next_run)}' if cron_job.unique else None
                 job_futures.add(
                     self.pool.enqueue_job(
-                        cron_job.name, _job_id=job_id, _queue_name=self.queue_name, _defer_until=cron_job.next_run
+                        cron_job.name,
+                        _job_id=job_id,
+                        _queue_name=self.queue_name,
+                        _defer_until=(
+                            cron_job.next_run if cron_job.next_run > datetime.now(tz=self.timezone) else None
+                        ),
                     )
                 )
                 cron_job.calculate_next(cron_job.next_run)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	# Version here is used for the package version via the `[tool.hatch.version]` section of `pyproject.toml`.
`2`		`-VERSION = '0.26.1'`
	`2`	`+VERSION = '0.26.3'`
Original file line number	Diff line number	Diff line change
`@@ -960,7 +960,12 @@ async def run_cron(self, n: datetime, delay: float, num_windows: int = 2) -> Non`
`960`	`960`	`job_id = f'{cron_job.name}:{to_unix_ms(cron_job.next_run)}' if cron_job.unique else None`
`961`	`961`	`job_futures.add(`
`962`	`962`	`self.pool.enqueue_job(`
`963`		`- cron_job.name, _job_id=job_id, _queue_name=self.queue_name, _defer_until=cron_job.next_run`
	`963`	`+ cron_job.name,`
	`964`	`+ _job_id=job_id,`
	`965`	`+ _queue_name=self.queue_name,`
	`966`	`+ _defer_until=(`
	`967`	`+ cron_job.next_run if cron_job.next_run > datetime.now(tz=self.timezone) else None`
	`968`	`+ ),`
`964`	`969`	`)`
`965`	`970`	`)`
`966`	`971`	`cron_job.calculate_next(cron_job.next_run)`