[ivantodorovich]

• Cancellation now cascades. Cancelling a job used to cancel only its direct dependents: in A → B → C, cancelling A left C in wait_dependencies forever.
  Test: test_button_cancel_dependencies_cascade
• A job is cancelled as soon as one of its dependencies is cancelled. It used to be cancelled only when all of them were, so a job with one cancelled and one done (or running) dependency waited forever.
  Tests: test_button_cancel_dependencies_other_parent_done, test_button_done_dependencies_other_parent_cancelled
• Cancelled dependents get a date_cancelled, the same as the cancelled job. It was left empty, so the autovacuum never removed them.
  Tests: test_button_cancel_dependencies, test_button_cancel_dependencies_cascade
• Cancelled dependents get a result telling why they were cancelled.
  Tests: test_button_cancel_dependencies_cascade, test_button_cancel_dependencies_selected
• Cancelling a job along with its dependent cancels the dependent once. It used to be cancelled a second time as part of the selection, overwriting its date and result.
  Test: test_button_cancel_dependencies_selected

_get_common_dependent_jobs_query is replaced by the dependency_ids / dependent_ids computed fields on queue.job, used to enqueue and cancel dependent jobs through the ORM.

[OCA-git-bot]

Hi @sbidoul, @guewen,
some modules you are maintaining are being modified, check this out!

[florentx]

I would use same date_cancelled as parent job, and do it a little bit differently:

--- a/queue_job/job.py
+++ b/queue_job/job.py
@@ -545,10 +545,10 @@ class Job:
             finally:
                 self._env = env
 
-    def _get_common_dependent_jobs_query(self):
-        return """
+    def _get_common_dependent_jobs_query(self, sql_set_clause):
+        return f"""
             UPDATE queue_job
-            SET state = %s
+            SET {sql_set_clause}
             FROM (
             SELECT child.id, array_agg(parent.state) as parent_states
             FROM queue_job job
@@ -579,13 +579,15 @@ class Job:
         return any(self.__reverse_depends_on_uuids)
 
     def enqueue_waiting(self):
-        sql = self._get_common_dependent_jobs_query()
+        sql = self._get_common_dependent_jobs_query("state = %s")
         self.env.cr.execute(sql, (PENDING, self.uuid, DONE, WAIT_DEPENDENCIES))
         self.env["queue.job"].invalidate_model(["state"])
 
     def cancel_dependent_jobs(self):
-        sql = self._get_common_dependent_jobs_query()
-        self.env.cr.execute(sql, (CANCELLED, self.uuid, CANCELLED, WAIT_DEPENDENCIES))
+        assert self.state == CANCELLED, "Job is not cancelled"
+        sql = self._get_common_dependent_jobs_query("state = %s, date_cancelled = %s")
+        sql_args = (CANCELLED, self.date_cancelled, self.uuid, CANCELLED, WAIT_DEPENDENCIES)
+        self.env.cr.execute(sql, sql_args)
         self.env["queue.job"].invalidate_model(["state"])
 
     def store(self):

[ivantodorovich]

Hi @florentx

I digged a bit deeper and found other issues with the current implementation, all described in the PR description and covered by new unit tests. So I decided to refactor and use the orm and computed fields instead of this query.