From fce6f9652f6b77ae1487aac28605ada649a1ff1e Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 10 Jun 2012 09:42:41 +0200 Subject: [PATCH] Ensure cancel status is set for canceled duplicate jobs -- partial fix for bug #1851 --- bacula/src/dird/job.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c index f769d20881..dae019bc7c 100644 --- a/bacula/src/dird/job.c +++ b/bacula/src/dird/job.c @@ -762,6 +762,7 @@ bool allow_duplicate_job(JCR *jcr) */ if (cancel_me) { /* Zap current job */ + jcr->setJobStatus(JS_Canceled); Jmsg(jcr, M_FATAL, 0, _("JobId %d already running. Duplicate job not allowed.\n"), djcr->JobId); break; /* get out of foreach_jcr */ @@ -796,6 +797,7 @@ bool allow_duplicate_job(JCR *jcr) Jmsg(jcr, M_INFO, 0, _("Cancelling duplicate JobId=%d.\n"), djcr->JobId); cancel_job(ua, djcr); bmicrosleep(0, 500000); + djcr->setJobStatus(JS_Canceled); cancel_job(ua, djcr); free_ua_context(ua); Dmsg2(800, "Cancel dup %p JobId=%d\n", djcr, djcr->JobId); @@ -803,6 +805,7 @@ bool allow_duplicate_job(JCR *jcr) /* * Zap current job */ + jcr->setJobStatus(JS_Canceled); Jmsg(jcr, M_FATAL, 0, _("JobId %d already running. Duplicate job not allowed.\n"), djcr->JobId); Dmsg2(800, "Cancel me %p JobId=%d\n", jcr, jcr->JobId); -- 2.39.5