Correct pool source setting

[bacula/bacula] / bacula / src / dird / jobq.c

diff --git a/bacula/src/dird/jobq.c b/bacula/src/dird/jobq.c
index 4d79e77a3d2d67d271afda8394233aeb8009b7b7..1535aebc07410ccdd04d05cc415150506a51a9f0 100755 (executable)
--- a/bacula/src/dird/jobq.c
+++ b/bacula/src/dird/jobq.c
@@ -208,6 +208,16 @@ int jobq_add(jobq_t *jq, JCR *jcr)
    pthread_t id;
    wait_pkt *sched_pkt;
 
+   if (!jcr->term_wait_inited) { 
+      /* Initialize termination condition variable */
+      if ((stat = pthread_cond_init(&jcr->term_wait, NULL)) != 0) {
+         berrno be;
+         Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), be.strerror(stat));
+         return stat;
+      }
+      jcr->term_wait_inited = true;
+   }                           
+                             
    Dmsg3(2300, "jobq_add jobid=%d jcr=0x%x use_count=%d\n", jcr->JobId, jcr, jcr->use_count());
    if (jq->valid != JOBQ_VALID) {
       Jmsg0(jcr, M_ERROR, 0, "Jobq_add queue not initialized.\n");
@@ -466,26 +476,29 @@ void *jobq_server(void *arg)
              jcr->JobStatus != JS_Canceled &&
              jcr->job->RescheduleTimes > 0 &&
              jcr->JobType == JT_BACKUP &&
-             jcr->reschedule_count < jcr->job->RescheduleTimes) {
-             char dt[50];
+             (jcr->job->RescheduleTimes == 0 ||
+              jcr->reschedule_count < jcr->job->RescheduleTimes)) {
+             char dt[50], dt2[50];
 
              /*
               * Reschedule this job by cleaning it up, but
               *  reuse the same JobId if possible.
               */
+            time_t now = time(NULL);
             jcr->reschedule_count++;
-            jcr->sched_time = time(NULL) + jcr->job->RescheduleInterval;
-            Dmsg2(2300, "Rescheduled Job %s to re-run in %d seconds.\n", jcr->Job,
-               (int)jcr->job->RescheduleInterval);
-            bstrftime(dt, sizeof(dt), time(NULL));
-            Jmsg(jcr, M_INFO, 0, _("Rescheduled Job %s at %s to re-run in %d seconds.\n"),
-               jcr->Job, dt, (int)jcr->job->RescheduleInterval);
+            jcr->sched_time = now + jcr->job->RescheduleInterval;
+            bstrftime(dt, sizeof(dt), now);
+            bstrftime(dt2, sizeof(dt2), jcr->sched_time);
+            Dmsg4(2300, "Rescheduled Job %s to re-run in %d seconds.(now=%u,then=%u)\n", jcr->Job,
+                  (int)jcr->job->RescheduleInterval, now, jcr->sched_time);
+            Jmsg(jcr, M_INFO, 0, _("Rescheduled Job %s at %s to re-run in %d seconds (%s).\n"),
+                 jcr->Job, dt, (int)jcr->job->RescheduleInterval, dt2);
             dird_free_jcr_pointers(jcr);     /* partial cleanup old stuff */
-            jcr->JobStatus = JS_WaitStartTime;
+            jcr->JobStatus = -1;
+            set_jcr_job_status(jcr, JS_WaitStartTime);
             jcr->SDJobStatus = 0;
             if (jcr->JobBytes == 0) {
                Dmsg2(2300, "Requeue job=%d use=%d\n", jcr->JobId, jcr->use_count());
-               jcr->JobStatus = JS_WaitStartTime;
                V(jq->mutex);
                jobq_add(jq, jcr);     /* queue the job to run again */
                P(jq->mutex);
@@ -498,13 +511,15 @@ void *jobq_server(void *arg)
              *   the old JobId or there will be database record
              *   conflicts.  We now create a new job, copying the
              *   appropriate fields.
-             */
+             */           
             JCR *njcr = new_jcr(sizeof(JCR), dird_free_jcr);
             set_jcr_defaults(njcr, jcr->job);
             njcr->reschedule_count = jcr->reschedule_count;
+            njcr->sched_time = jcr->sched_time;
             njcr->JobLevel = jcr->JobLevel;
-            njcr->JobStatus = jcr->JobStatus;
-            copy_storage(njcr, jcr->storage);
+            njcr->JobStatus = -1;
+            set_jcr_job_status(njcr, jcr->JobStatus);
+            copy_storage(njcr, jcr->storage, _("previous Job"));
             njcr->messages = jcr->messages;
             Dmsg0(2300, "Call to run new job\n");
             V(jq->mutex);