}
Dmsg0(50, "DB opened\n");
+ if (!jcr->fname) {
+ jcr->fname = get_pool_memory(PM_FNAME);
+ }
+ if (!jcr->pool_source) {
+ jcr->pool_source = get_pool_memory(PM_MESSAGE);
+ pm_strcpy(jcr->pool_source, _("unknown source"));
+ }
+ if (!jcr->storage_source) {
+ jcr->storage_source = get_pool_memory(PM_MESSAGE);
+ pm_strcpy(jcr->storage_source, _("unknown source"));
+ }
+
/*
* Create Job record
*/
}
Dmsg0(200, "Add jrc to work queue\n");
-
-
return true;
bail_out:
- if (jcr->fname) {
- free_memory(jcr->fname);
- jcr->fname = NULL;
- }
return false;
}
set_jcr_job_status(jcr, JS_Canceled);
}
+ /* TODO : check if it is used somewhere */
+ if (jcr->job->RunScripts == NULL)
+ {
+ Dmsg0(200, "Warning, job->RunScripts is empty\n");
+ jcr->job->RunScripts = New(alist(10, not_owned_by_alist));
+ }
+
/*
* Note, we continue, even if the job is canceled above. This
* will permit proper setting of the job start record and
generate_job_event(jcr, "JobInit");
set_jcr_job_status(jcr, JS_Running); /* this will be set only if no error */
- if (!jcr->fname) {
- jcr->fname = get_pool_memory(PM_FNAME);
- }
/*
* Now, do pre-run stuff, like setting job level (Inc/diff, ...)
if (job_canceled(jcr)) {
update_job_end_record(jcr);
-
} else {
+ /* Run any script BeforeJob on dird */
+ run_scripts(jcr, jcr->job->RunScripts, "BeforeJob");
- /* Run Job */
- if (jcr->job->RunBeforeJob) {
- POOLMEM *before = get_pool_memory(PM_FNAME);
- int status;
- BPIPE *bpipe;
- char line[MAXSTRING];
-
- before = edit_job_codes(jcr, before, jcr->job->RunBeforeJob, "");
- bpipe = open_bpipe(before, 0, "r");
- free_pool_memory(before);
- while (fgets(line, sizeof(line), bpipe->rfd)) {
- Jmsg(jcr, M_INFO, 0, _("RunBefore: %s"), line);
- }
- status = close_bpipe(bpipe);
- if (status != 0) {
- berrno be;
- Jmsg(jcr, M_FATAL, 0, _("RunBeforeJob error: ERR=%s\n"), be.strerror(status));
- set_jcr_job_status(jcr, JS_FatalError);
- update_job_end_record(jcr);
- goto bail_out;
- }
- }
/*
* We re-update the job start record so that the start
* time is set after the run before job. This avoids
* in the next job run because in that case, their date
* is after the start of this run.
*/
+ jcr->start_time = time(NULL);
+ jcr->jr.StartTime = jcr->start_time;
if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
}
Pmsg1(0, _("Unimplemented job type: %d\n"), jcr->JobType);
break;
}
- if ((jcr->job->RunAfterJob && jcr->JobStatus == JS_Terminated) ||
- (jcr->job->RunAfterFailedJob && jcr->JobStatus != JS_Terminated)) {
- POOLMEM *after = get_pool_memory(PM_FNAME);
- int status;
- BPIPE *bpipe;
- char line[MAXSTRING];
-
- if (jcr->JobStatus == JS_Terminated) {
- after = edit_job_codes(jcr, after, jcr->job->RunAfterJob, "");
- } else {
- after = edit_job_codes(jcr, after, jcr->job->RunAfterFailedJob, "");
- }
- bpipe = open_bpipe(after, 0, "r");
- free_pool_memory(after);
- while (fgets(line, sizeof(line), bpipe->rfd)) {
- Jmsg(jcr, M_INFO, 0, _("RunAfter: %s"), line);
- }
- status = close_bpipe(bpipe);
- /*
- * Note, if we get an error here, do not mark the
- * job in error, simply report the error condition.
- */
- if (status != 0) {
- berrno be;
- if (jcr->JobStatus == JS_Terminated) {
- Jmsg(jcr, M_WARNING, 0, _("RunAfterJob error: ERR=%s\n"), be.strerror(status));
- } else {
- Jmsg(jcr, M_FATAL, 0, _("RunAfterFailedJob error: ERR=%s\n"), be.strerror(status));
- }
- }
- }
+
+ run_scripts(jcr, jcr->job->RunScripts, "AfterJob");
+
/* Send off any queued messages */
if (jcr->msg_queue->size() > 0) {
dequeue_messages(jcr);
}
}
-bail_out:
generate_daemon_event(jcr, "JobEnd");
Dmsg1(50, "======== End Job stat=%c ==========\n", jcr->JobStatus);
sm_check(__FILE__, __LINE__, true);
/* Cancel Storage daemon */
if (jcr->store_bsock) {
if (!ua->jcr->storage) {
- copy_storage(ua->jcr, jcr->storage);
+ copy_storage(ua->jcr, jcr->storage, _("Job resource"));
} else {
set_storage(ua->jcr, jcr->store);
}
return cancel;
}
+/*
+ * Get or create a Pool record with the given name.
+ * Returns: 0 on error
+ * poolid if OK
+ */
+DBId_t get_or_create_pool_record(JCR *jcr, char *pool_name)
+{
+ POOL_DBR pr;
+
+ memset(&pr, 0, sizeof(pr));
+ bstrncpy(pr.Name, pool_name, sizeof(pr.Name));
+
+ while (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */
+ /* Try to create the pool */
+ if (create_pool(jcr, jcr->db, jcr->pool, POOL_OP_CREATE) < 0) {
+ Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name,
+ db_strerror(jcr->db));
+ return 0;
+ } else {
+ Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name);
+ }
+ }
+ return pr.PoolId;
+}
+
+void apply_pool_overrides(JCR *jcr)
+{
+ if (jcr->run_pool_override) {
+ pm_strcpy(jcr->pool_source, _("Run Pool override"));
+ }
+ /*
+ * Apply any level related Pool selections
+ */
+ switch (jcr->JobLevel) {
+ case L_FULL:
+ if (jcr->full_pool) {
+ jcr->pool = jcr->full_pool;
+ if (jcr->run_full_pool_override) {
+ pm_strcpy(jcr->pool_source, _("Run FullPool override"));
+ } else {
+ pm_strcpy(jcr->pool_source, _("Job FullPool override"));
+ }
+ }
+ break;
+ case L_INCREMENTAL:
+ if (jcr->inc_pool) {
+ jcr->pool = jcr->inc_pool;
+ if (jcr->run_inc_pool_override) {
+ pm_strcpy(jcr->pool_source, _("Run IncPool override"));
+ } else {
+ pm_strcpy(jcr->pool_source, _("Job IncPool override"));
+ }
+ }
+ break;
+ case L_DIFFERENTIAL:
+ if (jcr->diff_pool) {
+ jcr->pool = jcr->diff_pool;
+ if (jcr->run_diff_pool_override) {
+ pm_strcpy(jcr->pool_source, _("Run DiffPool override"));
+ } else {
+ pm_strcpy(jcr->pool_source, _("Job DiffPool override"));
+ }
+ }
+ break;
+ }
+}
+
/*
* Get or create a Client record for this Job
free_pool_memory(jcr->fname);
jcr->fname = NULL;
}
+ if (jcr->pool_source) {
+ free_pool_memory(jcr->pool_source);
+ jcr->pool_source = NULL;
+ }
+ if (jcr->storage_source) {
+ free_pool_memory(jcr->storage_source);
+ jcr->storage_source = NULL;
+ }
if (jcr->stime) {
Dmsg0(200, "Free JCR stime\n");
free_pool_memory(jcr->stime);
jcr->JobLevel = job->JobLevel;
break;
}
+ if (!jcr->fname) {
+ jcr->fname = get_pool_memory(PM_FNAME);
+ }
+ if (!jcr->pool_source) {
+ jcr->pool_source = get_pool_memory(PM_MESSAGE);
+ pm_strcpy(jcr->pool_source, _("unknown source"));
+ }
+ if (!jcr->storage_source) {
+ jcr->storage_source = get_pool_memory(PM_MESSAGE);
+ pm_strcpy(jcr->storage_source, _("unknown source"));
+ }
jcr->JobPriority = job->Priority;
/* Copy storage definitions -- deleted in dir_free_jcr above */
- copy_storage(jcr, job->storage);
+ copy_storage(jcr, job->storage, _("Job resource"));
jcr->client = job->client;
if (!jcr->client_name) {
jcr->client_name = get_pool_memory(PM_NAME);
}
pm_strcpy(jcr->client_name, jcr->client->hdr.name);
+ pm_strcpy(jcr->pool_source, _("Job resource"));
jcr->pool = job->pool;
jcr->full_pool = job->full_pool;
jcr->inc_pool = job->inc_pool;
- jcr->dif_pool = job->dif_pool;
+ jcr->diff_pool = job->diff_pool;
jcr->catalog = job->client->catalog;
jcr->fileset = job->fileset;
jcr->messages = job->messages;
/*
* Copy the storage definitions from an alist to the JCR
*/
-void copy_storage(JCR *jcr, alist *storage)
+void copy_storage(JCR *jcr, alist *storage, const char *where)
{
if (storage) {
STORE *st;
foreach_alist(st, storage) {
jcr->storage->append(st);
}
+ pm_strcpy(jcr->storage_source, where);
}
if (jcr->storage) {
jcr->store = (STORE *)jcr->storage->first();