Allow to cancel a job in the jobq with the runscript exit status 2

diff --git a/bacula/src/dird/jobq.c b/bacula/src/dird/jobq.c
index 5bc30757a2c96fee4516a0ed873765102ad9c544..586b131d699fdde2ec5b6614a28e0baa910bb2a9 100644 (file)
--- a/bacula/src/dird/jobq.c
+++ b/bacula/src/dird/jobq.c
@@ -572,6 +572,10 @@ void *jobq_server(void *arg)
                   }
                   break;
                case 2:          // skip priority checks
+                  jcr->setJobStatus(JS_Canceled);
+                  Jmsg(jcr, M_FATAL, 0, _("Job canceled from Runscript\n"));
+                  break;
+               case 3:          // skip priority checks
                   jcr->JobPriority = 9999;
                   Jmsg(jcr, M_INFO, 0, _("Job Priority adjusted.\n"));
                   break;
@@ -825,6 +829,10 @@ static bool acquire_resources(JCR *jcr)
 {
    bool skip_this_jcr = false;
 
+   if (jcr->is_canceled()) {
+      return false;
+   }
+
    jcr->acquired_resource_locks = false;
 /*
  * Turning this code off is likely to cause some deadlocks,