Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
static int start_server(jobq_t *jq);
static bool acquire_resources(JCR *jcr);
+static bool reschedule_job(JCR *jcr, jobq_t *jq, jobq_item_t *je);
static void dec_read_store(JCR *jcr);
static void dec_write_store(JCR *jcr);
jcr->acquired_resource_locks = false;
}
- /*
- * Reschedule the job if necessary and requested
- */
- if (jcr->job->RescheduleOnError &&
- jcr->JobStatus != JS_Terminated &&
- jcr->JobStatus != JS_Canceled &&
- jcr->JobType == JT_BACKUP &&
- (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 = 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 = -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());
- V(jq->mutex);
- jobq_add(jq, jcr); /* queue the job to run again */
- P(jq->mutex);
- free_jcr(jcr); /* release jcr */
- free(je); /* free the job entry */
- continue; /* look for another job to run */
- }
- /*
- * Something was actually backed up, so we cannot reuse
- * 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 = -1;
- set_jcr_job_status(njcr, jcr->JobStatus);
- if (jcr->rstore) {
- copy_rstorage(njcr, jcr->rstorage, _("previous Job"));
- } else {
- free_rstorage(njcr);
- }
- if (jcr->wstore) {
- copy_wstorage(njcr, jcr->wstorage, _("previous Job"));
- } else {
- free_wstorage(njcr);
- }
- njcr->messages = jcr->messages;
- Dmsg0(2300, "Call to run new job\n");
- V(jq->mutex);
- run_job(njcr); /* This creates a "new" job */
- free_jcr(njcr); /* release "new" jcr */
- P(jq->mutex);
- Dmsg0(2300, "Back from running new job.\n");
+ if (reschedule_job(jcr, jq, je)) {
+ continue; /* go look for more work */
}
+
/* Clean up and release old jcr */
Dmsg2(2300, "====== Termination job=%d use_cnt=%d\n", jcr->JobId, jcr->use_count());
jcr->SDJobStatus = 0;
Dmsg0(2300, "Done check ready, now check wait queue.\n");
if (!jq->waiting_jobs->empty() && !jq->quit) {
int Priority;
+ bool running_allow_mix = false;
je = (jobq_item_t *)jq->waiting_jobs->first();
jobq_item_t *re = (jobq_item_t *)jq->running_jobs->first();
if (re) {
Priority = re->jcr->JobPriority;
- Dmsg2(2300, "JobId %d is running. Look for pri=%d\n", re->jcr->JobId, Priority);
+ Dmsg2(2300, "JobId %d is running. Look for pri=%d\n",
+ re->jcr->JobId, Priority);
+ running_allow_mix = true;
+ for ( ; re; ) {
+ Dmsg2(2300, "JobId %d is also running with %s\n",
+ re->jcr->JobId,
+ re->jcr->job->allow_mixed_priority ? "mix" : "no mix");
+ if (!re->jcr->job->allow_mixed_priority) {
+ running_allow_mix = false;
+ break;
+ }
+ re = (jobq_item_t *)jq->running_jobs->next(re);
+ }
+ Dmsg1(2300, "The running job(s) %s mixing priorities.\n",
+ running_allow_mix ? "allow" : "don't allow");
} else {
Priority = je->jcr->JobPriority;
Dmsg1(2300, "No job running. Look for Job pri=%d\n", Priority);
JCR *jcr = je->jcr;
jobq_item_t *jn = (jobq_item_t *)jq->waiting_jobs->next(je);
- Dmsg3(2300, "Examining Job=%d JobPri=%d want Pri=%d\n",
- jcr->JobId, jcr->JobPriority, Priority);
+ Dmsg4(2300, "Examining Job=%d JobPri=%d want Pri=%d (%s)\n",
+ jcr->JobId, jcr->JobPriority, Priority,
+ jcr->job->allow_mixed_priority ? "mix" : "no mix");
/* Take only jobs of correct Priority */
- if (jcr->JobPriority != Priority) {
+ if (!(jcr->JobPriority == Priority
+ || (jcr->JobPriority < Priority &&
+ jcr->job->allow_mixed_priority && running_allow_mix))) {
set_jcr_job_status(jcr, JS_WaitPriority);
break;
}
return NULL;
}
+/*
+ * Returns true if cleanup done and we should look for more work
+ */
+static bool reschedule_job(JCR *jcr, jobq_t *jq, jobq_item_t *je)
+{
+ /*
+ * Reschedule the job if necessary and requested
+ */
+ if (jcr->job->RescheduleOnError &&
+ jcr->JobStatus != JS_Terminated &&
+ jcr->JobStatus != JS_Canceled &&
+ jcr->get_JobType() == JT_BACKUP &&
+ (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 = 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 = -1;
+ set_jcr_job_status(jcr, JS_WaitStartTime);
+ jcr->SDJobStatus = 0;
+ if (!allow_duplicate_job(jcr)) {
+ return false;
+ }
+ if (jcr->JobBytes == 0) {
+ Dmsg2(2300, "Requeue job=%d use=%d\n", jcr->JobId, jcr->use_count());
+ V(jq->mutex);
+ jobq_add(jq, jcr); /* queue the job to run again */
+ P(jq->mutex);
+ free_jcr(jcr); /* release jcr */
+ free(je); /* free the job entry */
+ return true; /* we already cleaned up */
+ }
+ /*
+ * Something was actually backed up, so we cannot reuse
+ * 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->set_JobLevel(jcr->get_JobLevel());
+ njcr->pool = jcr->pool;
+ njcr->run_pool_override = jcr->run_pool_override;
+ njcr->full_pool = jcr->full_pool;
+ njcr->run_full_pool_override = jcr->run_full_pool_override;
+ njcr->inc_pool = jcr->inc_pool;
+ njcr->run_inc_pool_override = jcr->run_inc_pool_override;
+ njcr->diff_pool = jcr->diff_pool;
+ njcr->JobStatus = -1;
+ set_jcr_job_status(njcr, jcr->JobStatus);
+ if (jcr->rstore) {
+ copy_rstorage(njcr, jcr->rstorage, _("previous Job"));
+ } else {
+ free_rstorage(njcr);
+ }
+ if (jcr->wstore) {
+ copy_wstorage(njcr, jcr->wstorage, _("previous Job"));
+ } else {
+ free_wstorage(njcr);
+ }
+ njcr->messages = jcr->messages;
+ njcr->spool_data = jcr->spool_data;
+ njcr->write_part_after_job = jcr->write_part_after_job;
+ Dmsg0(2300, "Call to run new job\n");
+ V(jq->mutex);
+ run_job(njcr); /* This creates a "new" job */
+ free_jcr(njcr); /* release "new" jcr */
+ P(jq->mutex);
+ Dmsg0(2300, "Back from running new job.\n");
+ }
+ return false;
+}
+
/*
* See if we can acquire all the necessary resources for the job (JCR)
*
bool skip_this_jcr = false;
jcr->acquired_resource_locks = false;
- if (jcr->rstore == jcr->wstore) { /* deadlock */
+/*
+ * Turning this code off is likely to cause some deadlocks,
+ * but we do not really have enough information here to
+ * know if this is really a deadlock (it may be a dual drive
+ * autochanger), and in principle, the SD reservation system
+ * should detect these deadlocks, so push the work off on is.
+ */
+#ifdef xxx
+ if (jcr->rstore && jcr->rstore == jcr->wstore) { /* possible deadlock */
Jmsg(jcr, M_FATAL, 0, _("Job canceled. Attempt to read and write same device.\n"
" Read storage \"%s\" (From %s) -- Write storage \"%s\" (From %s)\n"),
jcr->rstore->name(), jcr->rstore_source, jcr->wstore->name(), jcr->wstore_source);
set_jcr_job_status(jcr, JS_Canceled);
return false;
}
+#endif
if (jcr->rstore) {
Dmsg1(200, "Rstore=%s\n", jcr->rstore->name());
- if (jcr->rstore->NumConcurrentReadJobs == 0 &&
- jcr->rstore->NumConcurrentJobs < jcr->rstore->MaxConcurrentJobs) {
- /* Simple case, first job */
- jcr->rstore->NumConcurrentReadJobs = 1;
+ if (jcr->rstore->NumConcurrentJobs < jcr->rstore->MaxConcurrentJobs) {
+ jcr->rstore->NumConcurrentReadJobs++;
jcr->rstore->NumConcurrentJobs++;
- Dmsg0(200, "Set rncj=1\n");
- /* We can do this only if multi-drive autochanger */
-// } else if (jcr->rstore->NumConcurrentJobs < jcr->rstore->MaxConcurrentJobs
-// && jcr->rstore->NumConcurrentReadJobs < jcr->rstore->MaxConcurrentReadJobs) {
-// jcr->rstore->NumConcurrentReadJobs++;
-// jcr->rstore->NumConcurrentJobs++;
-// Dmsg1(200, "Inc rncj=%d\n", jcr->rstore->NumConcurrentJobs);
+ Dmsg1(200, "Inc rncj=%d\n", jcr->rstore->NumConcurrentJobs);
} else {
Dmsg1(200, "Fail rncj=%d\n", jcr->rstore->NumConcurrentJobs);
set_jcr_job_status(jcr, JS_WaitStoreRes);
if (jcr->wstore) {
Dmsg1(200, "Wstore=%s\n", jcr->wstore->name());
- if (jcr->wstore->NumConcurrentJobs == 0 &&
- jcr->wstore->NumConcurrentJobs < jcr->wstore->MaxConcurrentJobs) {
- /* Simple case, first job */
- jcr->wstore->NumConcurrentJobs = 1;
- Dmsg0(200, "Set wncj=1\n");
- } else if (jcr->wstore->NumConcurrentJobs < jcr->wstore->MaxConcurrentJobs) {
+ if (jcr->wstore->NumConcurrentJobs < jcr->wstore->MaxConcurrentJobs) {
jcr->wstore->NumConcurrentJobs++;
Dmsg1(200, "Inc wncj=%d\n", jcr->wstore->NumConcurrentJobs);
} else if (jcr->rstore) {
if (jcr->rstore) {
jcr->rstore->NumConcurrentReadJobs--; /* back out rstore */
jcr->rstore->NumConcurrentJobs--; /* back out rstore */
- Dmsg1(200, "Dec wncj=%d\n", jcr->wstore->NumConcurrentJobs);
+ Dmsg1(200, "Dec rncj=%d\n", jcr->rstore->NumConcurrentJobs);
ASSERT(jcr->rstore->NumConcurrentReadJobs >= 0);
ASSERT(jcr->rstore->NumConcurrentJobs >= 0);
}