* Version $Id$
*/
/*
- Copyright (C) 2000-2004 Kern Sibbald
+ Copyright (C) 2000-2005 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
/* Imported subroutines */
extern void term_scheduler();
extern void term_ua_server();
-extern int do_backup(JCR *jcr);
-extern bool do_mac(JCR *jcr);
-extern int do_admin(JCR *jcr);
-extern int do_restore(JCR *jcr);
-extern bool do_verify(JCR *jcr);
/* Imported variables */
extern time_t watchdog_time;
berrno be;
Emsg1(M_ABORT, 0, _("Could not init job queue: ERR=%s\n"), be.strerror(stat));
}
- if ((wd = new_watchdog()) == NULL) {
- Emsg0(M_ABORT, 0, _("Could not init job monitor watchdogs\n"));
- }
+ wd = new_watchdog();
wd->callback = job_monitor_watchdog;
wd->destructor = job_monitor_destructor;
wd->one_shot = false;
Dmsg4(100, "Created job record JobId=%d Name=%s Type=%c Level=%c\n",
jcr->JobId, jcr->Job, jcr->jr.JobType, jcr->jr.JobLevel);
+
+ if (!get_or_create_client_record(jcr)) {
+ goto bail_out;
+ }
+
+ if (!jcr->fname) {
+ jcr->fname = get_pool_memory(PM_FNAME);
+ }
+
+ /* Now, do pre-run stuff, like setting job level (Inc/diff, ...) */
+ switch (jcr->JobType) {
+ case JT_BACKUP:
+ if (!do_backup_init(jcr)) {
+ backup_cleanup(jcr, JS_ErrorTerminated);
+ }
+ break;
+ case JT_VERIFY:
+ if (!do_verify_init(jcr)) {
+ verify_cleanup(jcr, JS_ErrorTerminated);
+ }
+ break;
+ case JT_RESTORE:
+ if (!do_restore_init(jcr)) {
+ restore_cleanup(jcr, JS_ErrorTerminated);
+ }
+ break;
+ case JT_ADMIN:
+ if (!do_admin_init(jcr)) {
+ admin_cleanup(jcr, JS_ErrorTerminated);
+ }
+ break;
+ case JT_MIGRATION:
+ case JT_COPY:
+ case JT_ARCHIVE:
+ if (!do_mac_init(jcr)) { /* migration, archive, copy */
+ mac_cleanup(jcr, JS_ErrorTerminated);
+ }
+ break;
+ default:
+ Pmsg1(0, "Unimplemented job type: %d\n", jcr->JobType);
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ break;
+ }
+ if (job_canceled(jcr)) {
+ goto bail_out;
+ }
+
Dmsg0(200, "Add jrc to work queue\n");
/* Queue the job to be run */
return JobId;
bail_out:
- set_jcr_job_status(jcr, JS_ErrorTerminated);
+ if (jcr->fname) {
+ free_memory(jcr->fname);
+ jcr->fname = NULL;
+ }
V(jcr->mutex);
return JobId;
}
switch (jcr->JobType) {
case JT_BACKUP:
- do_backup(jcr);
- if (jcr->JobStatus == JS_Terminated) {
+ if (do_backup(jcr)) {
do_autoprune(jcr);
+ } else {
+ backup_cleanup(jcr, JS_ErrorTerminated);
}
break;
case JT_VERIFY:
- do_verify(jcr);
- if (jcr->JobStatus == JS_Terminated) {
+ if (do_verify(jcr)) {
do_autoprune(jcr);
+ } else {
+ verify_cleanup(jcr, JS_ErrorTerminated);
}
break;
case JT_RESTORE:
- do_restore(jcr);
- if (jcr->JobStatus == JS_Terminated) {
+ if (do_restore(jcr)) {
do_autoprune(jcr);
+ } else {
+ restore_cleanup(jcr, JS_ErrorTerminated);
}
break;
case JT_ADMIN:
- do_admin(jcr);
- if (jcr->JobStatus == JS_Terminated) {
+ if (do_admin(jcr)) {
do_autoprune(jcr);
+ } else {
+ admin_cleanup(jcr, JS_ErrorTerminated);
}
break;
case JT_MIGRATION:
case JT_COPY:
case JT_ARCHIVE:
- do_mac(jcr); /* migration, archive, copy */
- if (jcr->JobStatus == JS_Terminated) {
+ if (do_mac(jcr)) { /* migration, archive, copy */
do_autoprune(jcr);
+ } else {
+ mac_cleanup(jcr, JS_ErrorTerminated);
}
break;
default:
/* Cancel Storage daemon */
if (jcr->store_bsock) {
- if (!ua->jcr->storage[0]) {
+ if (!ua->jcr->storage) {
copy_storage(ua->jcr, jcr);
} else {
set_storage(ua->jcr, jcr->store);
control_jcr = (JCR *)self->data;
- Dmsg1(400, "job_monitor_watchdog %p called\n", self);
+ Dmsg1(800, "job_monitor_watchdog %p called\n", self);
lock_jcr_chain();
bool cancel;
if (jcr->JobId == 0) {
- Dmsg2(400, "Skipping JCR %p (%s) with JobId 0\n",
+ Dmsg2(800, "Skipping JCR %p (%s) with JobId 0\n",
jcr, jcr->Job);
/* Keep reference counts correct */
free_locked_jcr(jcr);
cancel |= job_check_maxruntime(control_jcr, jcr);
if (cancel) {
- Dmsg3(200, "Cancelling JCR %p jobid %d (%s)\n",
+ Dmsg3(800, "Cancelling JCR %p jobid %d (%s)\n",
jcr, jcr->JobId, jcr->Job);
UAContext *ua = new_ua_context(jcr);
cancel_job(ua, jcr);
free_ua_context(ua);
- Dmsg1(200, "Have cancelled JCR %p\n", jcr);
+ Dmsg1(800, "Have cancelled JCR %p\n", jcr);
}
/* Keep reference counts correct */
static bool job_check_maxwaittime(JCR *control_jcr, JCR *jcr)
{
bool cancel = false;
+ bool ok_to_cancel = false;
+ JOB *job = jcr->job;
- if (jcr->job->MaxWaitTime == 0) {
+ if (job->MaxWaitTime == 0 && job->FullMaxWaitTime == 0 &&
+ job->IncMaxWaitTime == 0 && job->DiffMaxWaitTime == 0) {
return false;
- }
- if ((watchdog_time - jcr->start_time) < jcr->job->MaxWaitTime) {
- Dmsg3(200, "Job %p (%s) with MaxWaitTime %d not expired\n",
- jcr, jcr->Job, jcr->job->MaxWaitTime);
+ }
+ if (jcr->JobLevel == L_FULL && job->FullMaxWaitTime != 0 &&
+ (watchdog_time - jcr->start_time) >= job->FullMaxWaitTime) {
+ ok_to_cancel = true;
+ } else if (jcr->JobLevel == L_DIFFERENTIAL && job->DiffMaxWaitTime != 0 &&
+ (watchdog_time - jcr->start_time) >= job->DiffMaxWaitTime) {
+ ok_to_cancel = true;
+ } else if (jcr->JobLevel == L_INCREMENTAL && job->IncMaxWaitTime != 0 &&
+ (watchdog_time - jcr->start_time) >= job->IncMaxWaitTime) {
+ ok_to_cancel = true;
+ } else if (job->MaxWaitTime != 0 &&
+ (watchdog_time - jcr->start_time) >= job->MaxWaitTime) {
+ ok_to_cancel = true;
+ }
+ if (!ok_to_cancel) {
return false;
}
- Dmsg3(200, "Job %d (%s): MaxWaitTime of %d seconds exceeded, "
+ Dmsg3(800, "Job %d (%s): MaxWaitTime of %d seconds exceeded, "
"checking status\n",
- jcr->JobId, jcr->Job, jcr->job->MaxWaitTime);
+ jcr->JobId, jcr->Job, job->MaxWaitTime);
switch (jcr->JobStatus) {
case JS_Created:
case JS_Blocked:
Dmsg0(200, "JCR blocked in #1\n");
break;
case JS_Running:
- Dmsg0(200, "JCR running, checking SD status\n");
+ Dmsg0(800, "JCR running, checking SD status\n");
switch (jcr->SDJobStatus) {
case JS_WaitMount:
case JS_WaitMedia:
case JS_WaitFD:
cancel = true;
- Dmsg0(200, "JCR blocked in #2\n");
+ Dmsg0(800, "JCR blocked in #2\n");
break;
default:
- Dmsg0(200, "JCR not blocked in #2\n");
+ Dmsg0(800, "JCR not blocked in #2\n");
break;
}
break;
case JS_ErrorTerminated:
case JS_Canceled:
case JS_FatalError:
- Dmsg0(200, "JCR already dead in #3\n");
+ Dmsg0(800, "JCR already dead in #3\n");
break;
default:
Jmsg1(jcr, M_ERROR, 0, _("Unhandled job status code %d\n"),
jcr->JobStatus);
}
- Dmsg3(200, "MaxWaitTime result: %scancel JCR %p (%s)\n",
+ Dmsg3(800, "MaxWaitTime result: %scancel JCR %p (%s)\n",
cancel ? "" : "do not ", jcr, jcr->job);
return cancel;
}
}
-/*
- * Free the Job Control Record if no one is still using it.
- * Called from main free_jcr() routine in src/lib/jcr.c so
- * that we can do our Director specific cleanup of the jcr.
- */
-void dird_free_jcr(JCR *jcr)
+/* Called directly from job rescheduling */
+void dird_free_jcr_pointers(JCR *jcr)
{
- Dmsg0(200, "Start dird free_jcr\n");
-
if (jcr->sd_auth_key) {
free(jcr->sd_auth_key);
jcr->sd_auth_key = NULL;
}
if (jcr->term_wait_inited) {
pthread_cond_destroy(&jcr->term_wait);
+ jcr->term_wait_inited = false;
}
+}
+
+/*
+ * Free the Job Control Record if no one is still using it.
+ * Called from main free_jcr() routine in src/lib/jcr.c so
+ * that we can do our Director specific cleanup of the jcr.
+ */
+void dird_free_jcr(JCR *jcr)
+{
+ Dmsg0(200, "Start dird free_jcr\n");
+
+ dird_free_jcr_pointers(jcr);
+
/* Delete lists setup to hold storage pointers */
- for (int i=0; i<MAX_STORE; i++) {
- if (jcr->storage[i]) {
- delete jcr->storage[i];
- }
+ if (jcr->storage) {
+ delete jcr->storage;
}
jcr->job_end_push.destroy();
Dmsg0(200, "End dird free_jcr\n");
*/
void set_jcr_defaults(JCR *jcr, JOB *job)
{
+ STORE *st;
jcr->job = job;
jcr->JobType = job->JobType;
switch (jcr->JobType) {
}
jcr->JobPriority = job->Priority;
/* Copy storage definitions -- deleted in dir_free_jcr above */
- for (int i=0; i < MAX_STORE; i++) {
- STORE *st;
- if (job->storage[i]) {
- if (jcr->storage[i]) {
- delete jcr->storage[i];
- }
- jcr->storage[i] = New(alist(10, not_owned_by_alist));
- foreach_alist(st, job->storage[i]) {
- jcr->storage[i]->append(st);
- }
+ if (job->storage) {
+ if (jcr->storage) {
+ delete jcr->storage;
+ }
+ jcr->storage = New(alist(10, not_owned_by_alist));
+ foreach_alist(st, job->storage) {
+ jcr->storage->append(st);
}
}
- if (jcr->storage[0]) {
- jcr->store = (STORE *)jcr->storage[0]->first();
+ if (jcr->storage) {
+ jcr->store = (STORE *)jcr->storage->first();
}
jcr->client = job->client;
if (!jcr->client_name) {
jcr->fileset = job->fileset;
jcr->messages = job->messages;
jcr->spool_data = job->spool_data;
+ jcr->write_part_after_job = job->write_part_after_job;
if (jcr->RestoreBootstrap) {
free(jcr->RestoreBootstrap);
jcr->RestoreBootstrap = NULL;
*/
void copy_storage(JCR *new_jcr, JCR *old_jcr)
{
- for (int i=0; i < MAX_STORE; i++) {
- if (old_jcr->storage[i]) {
- STORE *st;
- if (old_jcr->storage[i]) {
- delete old_jcr->storage[i];
- }
- new_jcr->storage[i] = New(alist(10, not_owned_by_alist));
- foreach_alist(st, old_jcr->storage[i]) {
- new_jcr->storage[i]->append(st);
- }
+ if (old_jcr->storage) {
+ STORE *st;
+ if (old_jcr->storage) {
+ delete old_jcr->storage;
}
- if (old_jcr->store) {
- new_jcr->store = old_jcr->store;
- } else if (new_jcr->storage[0]) {
- new_jcr->store = (STORE *)new_jcr->storage[0]->first();
+ new_jcr->storage = New(alist(10, not_owned_by_alist));
+ foreach_alist(st, old_jcr->storage) {
+ new_jcr->storage->append(st);
}
}
+ if (old_jcr->store) {
+ new_jcr->store = old_jcr->store;
+ } else if (new_jcr->storage) {
+ new_jcr->store = (STORE *)new_jcr->storage->first();
+ }
}
/* Set storage override */
void set_storage(JCR *jcr, STORE *store)
{
+ STORE *storage;
+
jcr->store = store;
- jcr->storage[0]->prepend(store);
+ foreach_alist(storage, jcr->storage) {
+ if (store == storage) {
+ return;
+ }
+ }
+ /* Store not in list, so add it */
+ jcr->storage->prepend(store);
}
projects / bacula / bacula / blobdiff