From: Alain Spineux <alain@baculasystems.com>
Date: Wed, 29 Dec 2021 18:27:23 +0000 (+0100)
Subject: Fix #8576 Cancel duplicate self deadlock
X-Git-Tag: Release-11.3.2~300
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdbf32d05adb1fa31365886fcf7fd546334b56aa;p=thirdparty%2Fbacula.git

Fix #8576 Cancel duplicate self deadlock

- The DIR self dedlock itself when trying to cancel a dusplicate job
- Use the cancel_thread to do the job
---

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 8e7c71f78..a7274b21f 100644
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -1195,14 +1195,15 @@ bool allow_duplicate_job(JCR *jcr)
          }
          if (cancel_dup || job->CancelRunningDuplicates) {
             /* Zap the duplicated job djcr */
-            UAContext *ua = new_ua_context(jcr);
             Jmsg(jcr, M_INFO, 0, _("Cancelling duplicate JobId=%d.\n"), djcr->JobId);
-            cancel_job(ua, djcr, 60);
-            bmicrosleep(0, 500000);
-            djcr->setJobStatus(JS_Canceled);
-            cancel_job(ua, djcr, 60);
-            free_ua_context(ua);
-            Dmsg2(800, "Cancel dup %p JobId=%d\n", djcr, djcr->JobId);
+            pthread_t thid;
+            int status;
+            djcr->inc_use_count(); // cancel_thread() calls free_jcr()
+            if ((status=pthread_create(&thid, NULL, cancel_thread, (void *)djcr)) != 0) {
+               berrno be;
+               Jmsg1(jcr, M_WARNING, 0, _("Cannot create cancel thread: ERR=%s\n"), be.bstrerror(status));
+               free_jcr(jcr);
+            }
          } else {
              /* Zap current job */
             jcr->setJobStatus(JS_Canceled);