*
*/
/*
- Copyright (C) 2003-2005 Kern Sibbald
+ Copyright (C) 2003-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
+ modify it under the terms of the GNU General Public License
+ version 2 as amended with additional clauses defined in the
+ file LICENSE in the main source directory.
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 General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
*/
}
/* Check every 30 seconds if canceled */
while (wtime > 0) {
- Dmsg2(2300, "Waiting on sched time, jobid=%d secs=%d\n", jcr->JobId, wtime);
+ Dmsg3(2300, "Waiting on sched time, jobid=%d secs=%d use=%d\n",
+ jcr->JobId, wtime, jcr->use_count());
if (wtime > 30) {
wtime = 30;
}
}
wtime = jcr->sched_time - time(NULL);
}
- P(jcr->mutex); /* lock jcr */
+ Dmsg1(200, "resched use=%d\n", jcr->use_count());
jobq_add(jq, jcr);
- V(jcr->mutex);
free_jcr(jcr); /* we are done with jcr */
Dmsg0(2300, "Exit sched_wait\n");
return NULL;
/*
* Add a job to the queue
* jq is a queue that was created with jobq_init
- *
- * On entry jcr->mutex must be locked.
- *
*/
int jobq_add(jobq_t *jq, JCR *jcr)
{
pthread_t id;
wait_pkt *sched_pkt;
- Dmsg3(2300, "jobq_add jobid=%d jcr=0x%x use_count=%d\n", jcr->JobId, jcr, jcr->use_count);
+ 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");
return EINVAL;
}
- jcr->use_count++; /* mark jcr in use by us */
- Dmsg3(2300, "jobq_add jobid=%d jcr=0x%x use_count=%d\n", jcr->JobId, jcr, jcr->use_count);
+ jcr->inc_use_count(); /* mark jcr in use by us */
+ Dmsg3(2300, "jobq_add jobid=%d jcr=0x%x use_count=%d\n", jcr->JobId, jcr, jcr->use_count());
if (!job_canceled(jcr) && wtime > 0) {
set_thread_concurrency(jq->max_workers + 2);
sched_pkt = (wait_pkt *)malloc(sizeof(wait_pkt));
if ((stat = pthread_mutex_lock(&jq->mutex)) != 0) {
berrno be;
Jmsg1(jcr, M_ERROR, 0, _("pthread_mutex_lock: ERR=%s\n"), be.strerror(stat));
- jcr->use_count--; /* release jcr */
+ free_jcr(jcr); /* release jcr */
return stat;
}
if ((item = (jobq_item_t *)malloc(sizeof(jobq_item_t))) == NULL) {
- jcr->use_count--; /* release jcr */
+ free_jcr(jcr); /* release jcr */
return ENOMEM;
}
item->jcr = jcr;
V(jq->mutex);
/* Call user's routine here */
- Dmsg1(2300, "Calling user engine for jobid=%d\n", jcr->JobId);
+ Dmsg2(2300, "Calling user engine for jobid=%d use=%d\n", jcr->JobId,
+ jcr->use_count());
jq->engine(je->jcr);
- Dmsg1(2300, "Back from user engine jobid=%d.\n", jcr->JobId);
+ Dmsg2(2300, "Back from user engine jobid=%d use=%d.\n", jcr->JobId,
+ jcr->use_count());
/* Reacquire job queue lock */
P(jq->mutex);
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) {
- Dmsg1(2300, "Requeue job=%d\n", jcr->JobId);
- jcr->JobStatus = JS_WaitStartTime;
+ 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 */
}
* 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);
njcr->messages = jcr->messages;
Dmsg0(2300, "Call to run new job\n");
V(jq->mutex);
db_close_database(jcr, jcr->db);
jcr->db = NULL;
}
- Dmsg2(2300, "====== Termination job=%d use_cnt=%d\n", jcr->JobId, jcr->use_count);
+ Dmsg2(2300, "====== Termination job=%d use_cnt=%d\n", jcr->JobId, jcr->use_count());
jcr->SDJobStatus = 0;
V(jq->mutex); /* release internal lock */
free_jcr(jcr);
projects / bacula / bacula / blobdiff