/*
- Bacula® - The Network Backup Solution
-
- Copyright (C) 2003-2011 Free Software Foundation Europe e.V.
-
- The main author of Bacula is Kern Sibbald, with contributions from
- many others, a complete list can be found in the file AUTHORS.
- This program is Free Software; you can redistribute it and/or
- modify it under the terms of version three of the GNU Affero General Public
- License as published by the Free Software Foundation and included
- in the file LICENSE.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
-
- 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.
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2015 Kern Sibbald
+
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
*/
/*
* Bacula job queue routines.
P(jq->mutex);
jq->valid = 0; /* prevent any more operations */
- /*
- * If any threads are active, wake them
+ /*
+ * If any threads are active, wake them
*/
if (jq->num_workers > 0) {
jq->quit = true;
}
/* Check every 30 seconds if canceled */
while (wtime > 0) {
- Dmsg3(2300, "Waiting on sched time, jobid=%d secs=%d use=%d\n",
+ Dmsg3(2300, "Waiting on sched time, jobid=%d secs=%d use=%d\n",
jcr->JobId, wtime, jcr->use_count());
if (wtime > 30) {
wtime = 30;
return NULL;
}
+/* Procedure to update the Client->NumConcurrentJobs */
+static void update_client_numconcurrentjobs(JCR *jcr, int val)
+{
+ if (!jcr->client) {
+ return;
+ }
+
+ switch (jcr->getJobType())
+ {
+ case JT_MIGRATE:
+ case JT_COPY:
+ case JT_ADMIN:
+ break;
+ case JT_BACKUP:
+ if (jcr->no_client_used()) {
+ break;
+ }
+ /* Failback wanted */
+ default:
+ jcr->client->NumConcurrentJobs += val;
+ break;
+ }
+}
+
/*
* Add a job to the queue
* jq is a queue that was created with jobq_init
pthread_t id;
wait_pkt *sched_pkt;
- if (!jcr->term_wait_inited) {
+ if (!jcr->term_wait_inited) {
/* Initialize termination condition variable */
if ((stat = pthread_cond_init(&jcr->term_wait, NULL)) != 0) {
berrno be;
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");
sched_pkt = (wait_pkt *)malloc(sizeof(wait_pkt));
sched_pkt->jcr = jcr;
sched_pkt->jq = jq;
- stat = pthread_create(&id, &jq->attr, sched_wait, (void *)sched_pkt);
+ stat = pthread_create(&id, &jq->attr, sched_wait, (void *)sched_pkt);
if (stat != 0) { /* thread not created */
berrno be;
Jmsg1(jcr, M_ERROR, 0, _("pthread_thread_create: ERR=%s\n"), be.bstrerror(stat));
/*
* if any threads are idle, wake one.
- * Actually we do a broadcast because on /lib/tls
+ * Actually we do a broadcast because on /lib/tls
* these signals seem to get lost from time to time.
*/
if (jq->idle_workers > 0) {
jq->running_jobs->append(je);
/* Attach jcr to this thread while we run the job */
+ jcr->my_thread_id = pthread_self();
jcr->set_killable(true);
set_jcr_in_tsd(jcr);
Dmsg1(2300, "Took jobid=%d from ready and appended to run\n", jcr->JobId);
if (jcr->acquired_resource_locks) {
dec_read_store(jcr);
dec_write_store(jcr);
- jcr->client->NumConcurrentJobs--;
+ update_client_numconcurrentjobs(jcr, -1);
jcr->job->NumConcurrentJobs--;
jcr->acquired_resource_locks = false;
}
running_allow_mix = true;
for ( ; re; ) {
Dmsg2(2300, "JobId %d is also running with %s\n",
- re->jcr->JobId,
+ re->jcr->JobId,
re->jcr->job->allow_mixed_priority ? "mix" : "no mix");
if (!re->jcr->job->allow_mixed_priority) {
running_allow_mix = false;
/* Basic condition is that more reschedule times remain */
if (jcr->job->RescheduleTimes == 0 ||
jcr->reschedule_count < jcr->job->RescheduleTimes) {
- resched =
+ resched =
/* Check for incomplete jobs */
- (jcr->job->RescheduleIncompleteJobs &&
+ (jcr->RescheduleIncompleteJobs &&
jcr->is_incomplete() && jcr->is_JobType(JT_BACKUP) &&
- !jcr->is_JobLevel(L_BASE)) ||
+ !(jcr->HasBase||jcr->is_JobLevel(L_BASE))) ||
/* Check for failed jobs */
(jcr->job->RescheduleOnError &&
!jcr->is_JobStatus(JS_Terminated) &&
if (jcr->wasVirtualFull) {
jcr->setJobLevel(L_VIRTUAL_FULL);
}
+ /*
+ * When we are using the same jcr then make sure to reset
+ * RealEndTime back to zero.
+ */
+ jcr->jr.RealEndTime = 0;
jobq_add(jq, jcr); /* queue the job to run again */
P(jq->mutex);
free_jcr(jcr); /* release jcr */
* 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);
+ /*
+ * Eliminate the new job_end_push, then copy the one from
+ * the old job, and set the old one to be empty.
+ */
+ void *v;
+ lock_jobs(); /* protect ourself from reload_config() */
+ LockRes();
+ foreach_alist(v, (&jcr->job_end_push)) {
+ njcr->job_end_push.append(v);
+ }
+ jcr->job_end_push.destroy();
+ jcr->job_end_push.init(1, false);
+ UnlockRes();
+ unlock_jobs();
+
njcr->reschedule_count = jcr->reschedule_count;
njcr->sched_time = jcr->sched_time;
+ njcr->initial_sched_time = jcr->initial_sched_time;
/*
* Special test here since a Virtual Full gets marked
* as a Full, so we look at the resource record
}
njcr->pool = jcr->pool;
njcr->run_pool_override = jcr->run_pool_override;
+ njcr->next_pool = jcr->next_pool;
+ njcr->run_next_pool_override = jcr->run_next_pool_override;
njcr->full_pool = jcr->full_pool;
+ njcr->vfull_pool = jcr->vfull_pool;
njcr->run_full_pool_override = jcr->run_full_pool_override;
+ njcr->run_vfull_pool_override = jcr->run_vfull_pool_override;
njcr->inc_pool = jcr->inc_pool;
njcr->run_inc_pool_override = jcr->run_inc_pool_override;
njcr->diff_pool = jcr->diff_pool;
#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"),
+ " Read storage \"%s\" (From %s) -- Write storage \"%s\" (From %s)\n"),
jcr->rstore->name(), jcr->rstore_source, jcr->wstore->name(), jcr->wstore_source);
jcr->setJobStatus(JS_Canceled);
return false;
return false;
}
}
-
+
if (jcr->wstore) {
Dmsg1(200, "Wstore=%s\n", jcr->wstore->name());
if (jcr->wstore->NumConcurrentJobs < jcr->wstore->MaxConcurrentJobs) {
return false;
}
- if (jcr->client->NumConcurrentJobs < jcr->client->MaxConcurrentJobs) {
- jcr->client->NumConcurrentJobs++;
- } else {
- /* Back out previous locks */
- dec_write_store(jcr);
- dec_read_store(jcr);
- jcr->setJobStatus(JS_WaitClientRes);
- return false;
+ if (jcr->client) {
+ if (jcr->client->NumConcurrentJobs < jcr->client->MaxConcurrentJobs) {
+ update_client_numconcurrentjobs(jcr, 1);
+ } else {
+ /* Back out previous locks */
+ dec_write_store(jcr);
+ dec_read_store(jcr);
+ jcr->setJobStatus(JS_WaitClientRes);
+ return false;
+ }
}
if (jcr->job->NumConcurrentJobs < jcr->job->MaxConcurrentJobs) {
jcr->job->NumConcurrentJobs++;
/* Back out previous locks */
dec_write_store(jcr);
dec_read_store(jcr);
- jcr->client->NumConcurrentJobs--;
+ update_client_numconcurrentjobs(jcr, -1);
jcr->setJobStatus(JS_WaitJobRes);
return false;
}
static pthread_mutex_t rstore_mutex = PTHREAD_MUTEX_INITIALIZER;
-/*
+/*
* Note: inc_read_store() and dec_read_store() are
* called from select_rstore() in src/dird/restore.c
*/
bool inc_read_store(JCR *jcr)
{
P(rstore_mutex);
- if (jcr->rstore->NumConcurrentJobs < jcr->rstore->MaxConcurrentJobs) {
+ if (jcr->rstore->NumConcurrentJobs < jcr->rstore->MaxConcurrentJobs &&
+ (jcr->getJobType() == JT_RESTORE ||
+ jcr->rstore->MaxConcurrentReadJobs == 0 ||
+ jcr->rstore->NumConcurrentReadJobs < jcr->rstore->MaxConcurrentReadJobs)) {
jcr->rstore->NumConcurrentReadJobs++;
jcr->rstore->NumConcurrentJobs++;
Dmsg1(200, "Inc rncj=%d\n", jcr->rstore->NumConcurrentJobs);
projects / bacula / bacula / blobdiff