Fixed acquire_jobs method in MongoDB DataStore.

agronholm · Jul 29, 2024 · f8339f9 · f8339f9
1 parent 783129c
commit f8339f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,5 @@ docs/_build/
 build/
 virtualenv/
 venv*/
+env*/
 example.sqlite
diff --git a/src/apscheduler/datastores/mongodb.py b/src/apscheduler/datastores/mongodb.py
@@ -628,7 +628,7 @@ async def acquire_jobs(
                     )
                     async for doc in cursor:
                         task_max_running_jobs = doc["max_running_jobs"]
-                        task_job_slots_left[doc["_id"]] = doc["max_running_jobs"]
+                        task_job_slots_left[doc["_id"]] = (doc["max_running_jobs"] - doc["running_jobs"])
 
                 acquired_jobs: list[Job] = []
                 skipped_job_ids: list[UUID] = []
@@ -684,10 +684,13 @@ async def acquire_jobs(
                         continue
 
                     # Skip and un-acquire the job if no more slots are available
-                    if not task_job_slots_left.get(job.task_id, float("inf")):
+                    task_slots_left = task_job_slots_left.get(job.task_id, float("inf"))
+                    if not task_slots_left or running_job_count_increments[job.task_id] == task_slots_left:
                         self._logger.debug(
                             "Skipping job %s because task %r has the maximum "
                             "number of %d jobs already running",
+                            job,
+                            job.task_id,
                             task_max_running_jobs,
                         )
                         skipped_job_ids.append(job.id)