Merge PR #900 into 18.0

Signed-off-by sbidoul

Author: OCA-git-bot

queue_job/controllers/main.py

@@ -108,6 +108,10 @@ def _try_perform_job(cls, env, job):
 
     @classmethod
     def _enqueue_dependent_jobs(cls, env, job):
+        if not job.should_check_dependents():
+            return
+
+        _logger.debug("%s enqueue depends started", job)
         tries = 0
         while True:
             try:
@@ -136,6 +140,7 @@ def _enqueue_dependent_jobs(cls, env, job):
                 time.sleep(wait_time)
             else:
                 break
+        _logger.debug("%s enqueue depends done", job)
 
     @classmethod
     def _runjob(cls, env: api.Environment, job: Job) -> None:
@@ -167,6 +172,7 @@ def retry_postpone(job, message, seconds=None):
             # traceback in the logs we should have the traceback when all
             # retries are exhausted
             env.cr.rollback()
+            return
 
         except (FailedJobError, Exception) as orig_exception:
             buff = StringIO()
@@ -182,9 +188,7 @@ def retry_postpone(job, message, seconds=None):
                 buff.close()
             raise
 
-        _logger.debug("%s enqueue depends started", job)
         cls._enqueue_dependent_jobs(env, job)
-        _logger.debug("%s enqueue depends done", job)
 
     @classmethod
     def _get_failure_values(cls, job, traceback_txt, orig_exception):

queue_job/job.py

@@ -537,6 +537,9 @@ def _get_common_dependent_jobs_query(self):
             AND state = %s;
         """
 
+    def should_check_dependents(self):
+        return any(self.__reverse_depends_on_uuids)
+
     def enqueue_waiting(self):
         sql = self._get_common_dependent_jobs_query()
         self.env.cr.execute(sql, (PENDING, self.uuid, DONE, WAIT_DEPENDENCIES))

test_queue_job/tests/test_dependencies.py

@@ -287,3 +287,16 @@ def test_depends_graph_uuid_group(self):
         self.assertTrue(jobs[0].graph_uuid)
         self.assertTrue(jobs[1].graph_uuid)
         self.assertEqual(jobs[0].graph_uuid, jobs[1].graph_uuid)
+
+    def test_should_check_dependents(self):
+        job_root = Job(self.method)
+        job_a = Job(self.method)
+        job_a.add_depends({job_root})
+
+        DelayableGraph._ensure_same_graph_uuid([job_root, job_a])
+
+        job_root.store()
+        job_a.store()
+
+        self.assertTrue(job_root.should_check_dependents())
+        self.assertFalse(job_a.should_check_dependents())