* Version $Id$
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
#include "dird.h"
/* Forward referenced subroutines */
-static void job_thread(void *arg);
+static void *job_thread(void *arg);
+static char *edit_run_codes(JCR *jcr, char *omsg, char *imsg);
+static void release_resource_locks(JCR *jcr);
+static int acquire_resource_locks(JCR *jcr);
+#ifdef USE_SEMAPHORE
+static void backoff_resource_locks(JCR *jcr, int count);
+#endif
/* Exported subroutines */
void run_job(JCR *jcr);
-void init_job_server(int max_workers);
/* Imported subroutines */
extern void term_scheduler();
extern void term_ua_server();
extern int do_backup(JCR *jcr);
+extern int do_admin(JCR *jcr);
extern int do_restore(JCR *jcr);
extern int do_verify(JCR *jcr);
-extern void backup_cleanup(void);
-extern void start_UA_server(int port);
+#ifdef USE_SEMAPHORE
+static semlock_t job_lock;
+static pthread_mutex_t mutex;
+static pthread_cond_t resource_wait;
+static int waiting = 0; /* count of waiting threads */
+#else
/* Queue of jobs to be run */
-static workq_t job_wq; /* our job work queue */
-
+workq_t job_wq; /* our job work queue */
+#endif
void init_job_server(int max_workers)
{
int stat;
+#ifdef USE_SEMAPHORE
+ if ((stat = sem_init(&job_lock, max_workers)) != 0) {
+ Emsg1(M_ABORT, 0, _("Could not init job lock: ERR=%s\n"), strerror(stat));
+ }
+ if ((stat = pthread_mutex_init(&mutex, NULL)) != 0) {
+ Emsg1(M_ABORT, 0, _("Could not init resource mutex: ERR=%s\n"), strerror(stat));
+ }
+ if ((stat = pthread_cond_init(&resource_wait, NULL)) != 0) {
+ Emsg1(M_ABORT, 0, _("Could not init resource wait: ERR=%s\n"), strerror(stat));
+ }
+#else
if ((stat = workq_init(&job_wq, max_workers, job_thread)) != 0) {
Emsg1(M_ABORT, 0, _("Could not init job work queue: ERR=%s\n"), strerror(stat));
}
+#endif
return;
}
void run_job(JCR *jcr)
{
int stat, errstat;
-
+#ifdef USE_SEMAPHORE
+ pthread_t tid;
+#else
+ workq_ele_t *work_item;
+#endif
+
+ sm_check(__FILE__, __LINE__, True);
+ init_msg(jcr, jcr->messages);
create_unique_job_name(jcr, jcr->job->hdr.name);
+ set_jcr_job_status(jcr, JS_Created);
jcr->jr.SchedTime = jcr->sched_time;
jcr->jr.StartTime = jcr->start_time;
jcr->jr.Type = jcr->JobType;
- jcr->jr.Level = jcr->level;
- strcpy(jcr->jr.Name, jcr->job->hdr.name);
- strcpy(jcr->jr.Job, jcr->Job);
+ jcr->jr.Level = jcr->JobLevel;
+ jcr->jr.JobStatus = jcr->JobStatus;
+ bstrncpy(jcr->jr.Name, jcr->job->hdr.name, sizeof(jcr->jr.Name));
+ bstrncpy(jcr->jr.Job, jcr->Job, sizeof(jcr->jr.Job));
/* Initialize termination condition variable */
if ((errstat = pthread_cond_init(&jcr->term_wait, NULL)) != 0) {
- Emsg1(M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat));
- jcr->JobStatus = JS_ErrorTerminated;
+ Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat));
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
free_jcr(jcr);
return;
}
* Open database
*/
Dmsg0(50, "Open database\n");
- jcr->db=db_init_database(jcr->catalog->db_name, jcr->catalog->db_user,
- jcr->catalog->db_password);
- if (!db_open_database(jcr->db)) {
+ jcr->db=db_init_database(jcr, jcr->catalog->db_name, jcr->catalog->db_user,
+ jcr->catalog->db_password, jcr->catalog->db_address,
+ jcr->catalog->db_port, jcr->catalog->db_socket);
+ if (!db_open_database(jcr, jcr->db)) {
Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
- db_close_database(jcr->db);
- jcr->JobStatus = JS_ErrorTerminated;
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
free_jcr(jcr);
return;
}
Dmsg0(50, "DB opened\n");
-
/*
* Create Job record
*/
jcr->jr.JobStatus = jcr->JobStatus;
- if (!db_create_job_record(jcr->db, &jcr->jr)) {
+ if (!db_create_job_record(jcr, jcr->db, &jcr->jr)) {
Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
- db_close_database(jcr->db);
- jcr->JobStatus = JS_ErrorTerminated;
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
free_jcr(jcr);
return;
}
jcr->JobId, jcr->Job, jcr->jr.Type, jcr->jr.Level);
Dmsg0(200, "Add jrc to work queue\n");
-
+#ifdef USE_SEMAPHORE
+ if ((stat = pthread_create(&tid, NULL, job_thread, (void *)jcr)) != 0) {
+ Emsg1(M_ABORT, 0, _("Unable to create job thread: ERR=%s\n"), strerror(stat));
+ }
+#else
/* Queue the job to be run */
- if ((stat = workq_add(&job_wq, (void *)jcr)) != 0) {
+ if ((stat = workq_add(&job_wq, (void *)jcr, &work_item, 0)) != 0) {
Emsg1(M_ABORT, 0, _("Could not add job to work queue: ERR=%s\n"), strerror(stat));
}
+ jcr->work_item = work_item;
+#endif
Dmsg0(200, "Done run_job()\n");
}
* from the work queue.
* At this point, we are running in our own thread
*/
-static void job_thread(void *arg)
+static void *job_thread(void *arg)
{
- time_t now;
JCR *jcr = (JCR *)arg;
- time(&now);
-
- Dmsg0(100, "=====Start Job=========\n");
- jcr->start_time = now; /* set the real start time */
- if (jcr->job->MaxStartDelay != 0 && jcr->job->MaxStartDelay <
- (btime_t)(jcr->start_time - jcr->sched_time)) {
- Jmsg(jcr, M_FATAL, 0, _("Job cancelled because max delay time exceeded.\n"));
- jcr->JobStatus = JS_ErrorTerminated;
- update_job_end_record(jcr);
- } else {
+ pthread_detach(pthread_self());
+ sm_check(__FILE__, __LINE__, True);
- /* Run Job */
- jcr->JobStatus = JS_Running;
+ for ( ;; ) {
+ if (!acquire_resource_locks(jcr)) {
+ set_jcr_job_status(jcr, JS_Canceled);
+ }
- switch (jcr->JobType) {
- case JT_BACKUP:
- do_backup(jcr);
- do_autoprune(jcr);
- break;
- case JT_VERIFY:
- do_verify(jcr);
-// do_autoprune(jcr);
- break;
- case JT_RESTORE:
- do_restore(jcr);
-// do_autoprune(jcr);
- break;
- case JT_ADMIN:
- /* No actual job */
- do_autoprune(jcr);
- break;
- default:
- Dmsg1(0, "Unimplemented job type: %d\n", jcr->JobType);
- break;
+ Dmsg0(200, "=====Start Job=========\n");
+ jcr->start_time = time(NULL); /* set the real start time */
+ set_jcr_job_status(jcr, JS_Running);
+
+ if (job_canceled(jcr)) {
+ update_job_end_record(jcr);
+ } else if (jcr->job->MaxStartDelay != 0 && jcr->job->MaxStartDelay <
+ (utime_t)(jcr->start_time - jcr->sched_time)) {
+ Jmsg(jcr, M_FATAL, 0, _("Job canceled because max start delay time exceeded.\n"));
+ set_jcr_job_status(jcr, JS_Canceled);
+ update_job_end_record(jcr);
+ } else {
+
+ /* Run Job */
+ if (jcr->job->RunBeforeJob) {
+ POOLMEM *before = get_pool_memory(PM_FNAME);
+ int status;
+ BPIPE *bpipe;
+ char line[MAXSTRING];
+
+ before = edit_run_codes(jcr, before, jcr->job->RunBeforeJob);
+ bpipe = open_bpipe(before, 0, "r");
+ while (fgets(line, sizeof(line), bpipe->rfd)) {
+ Jmsg(jcr, M_INFO, 0, _("RunBefore: %s"), line);
+ }
+ status = close_bpipe(bpipe);
+ if (status != 0) {
+ Jmsg(jcr, M_FATAL, 0, _("RunBeforeJob returned non-zero status=%d\n"),
+ status);
+ set_jcr_job_status(jcr, JS_FatalError);
+ update_job_end_record(jcr);
+ free_pool_memory(before);
+ goto bail_out;
+ }
+ free_pool_memory(before);
+ }
+ switch (jcr->JobType) {
+ case JT_BACKUP:
+ do_backup(jcr);
+ if (jcr->JobStatus == JS_Terminated) {
+ do_autoprune(jcr);
+ }
+ break;
+ case JT_VERIFY:
+ do_verify(jcr);
+ if (jcr->JobStatus == JS_Terminated) {
+ do_autoprune(jcr);
+ }
+ break;
+ case JT_RESTORE:
+ do_restore(jcr);
+ if (jcr->JobStatus == JS_Terminated) {
+ do_autoprune(jcr);
+ }
+ break;
+ case JT_ADMIN:
+ do_admin(jcr);
+ if (jcr->JobStatus == JS_Terminated) {
+ do_autoprune(jcr);
+ }
+ break;
+ default:
+ Pmsg1(0, "Unimplemented job type: %d\n", jcr->JobType);
+ break;
+ }
+ if (jcr->job->RunAfterJob) {
+ POOLMEM *after = get_pool_memory(PM_FNAME);
+ int status;
+ BPIPE *bpipe;
+ char line[MAXSTRING];
+
+ after = edit_run_codes(jcr, after, jcr->job->RunAfterJob);
+ bpipe = open_bpipe(after, 0, "r");
+ while (fgets(line, sizeof(line), bpipe->rfd)) {
+ Jmsg(jcr, M_INFO, 0, _("RunAfter: %s"), line);
+ }
+ status = close_bpipe(bpipe);
+ if (status != 0) {
+ Jmsg(jcr, M_FATAL, 0, _("RunAfterJob returned non-zero status=%d\n"),
+ status);
+ set_jcr_job_status(jcr, JS_FatalError);
+ update_job_end_record(jcr);
+ }
+ free_pool_memory(after);
}
+ }
+bail_out:
+ release_resource_locks(jcr);
+ if (jcr->job->RescheduleOnError &&
+ jcr->JobStatus != JS_Terminated &&
+ jcr->JobStatus != JS_Canceled &&
+ jcr->job->RescheduleTimes > 0 &&
+ jcr->reschedule_count < jcr->job->RescheduleTimes) {
+
+ /*
+ * Reschedule this job by cleaning it up, but
+ * reuse the same JobId if possible.
+ */
+ jcr->reschedule_count++;
+ jcr->sched_time = time(NULL) + jcr->job->RescheduleInterval;
+ Dmsg2(000, "Reschedule Job %s in %d seconds.\n", jcr->Job,
+ (int)jcr->job->RescheduleInterval);
+ jcr->JobStatus = JS_Created; /* force new status */
+ dird_free_jcr(jcr); /* partial cleanup old stuff */
+ if (jcr->JobBytes == 0) {
+ continue; /* reschedule the job */
+ }
+ /*
+ * 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->JobLevel = jcr->JobLevel;
+ njcr->JobStatus = jcr->JobStatus;
+ njcr->pool = jcr->pool;
+ njcr->store = jcr->store;
+ njcr->messages = jcr->messages;
+ run_job(njcr);
+ }
+ break;
+ }
+
+ if (jcr->db) {
+ Dmsg0(200, "Close DB\n");
+ db_close_database(jcr, jcr->db);
+ jcr->db = NULL;
}
- Dmsg0(50, "Before free jcr\n");
free_jcr(jcr);
Dmsg0(50, "======== End Job ==========\n");
+ sm_check(__FILE__, __LINE__, True);
+ return NULL;
+}
+
+/*
+ * Acquire the resources needed. These locks limit the
+ * number of jobs by each resource. We have limits on
+ * Jobs, Clients, Storage, and total jobs.
+ */
+static int acquire_resource_locks(JCR *jcr)
+{
+ time_t now = time(NULL);
+ time_t wtime = jcr->sched_time - now;
+
+ /* Wait until scheduled time arrives */
+ if (wtime > 0 && verbose) {
+ Jmsg(jcr, M_INFO, 0, _("Job %s waiting %d seconds for scheduled start time.\n"),
+ jcr->Job, wtime);
+ set_jcr_job_status(jcr, JS_WaitStartTime);
+ }
+ /* Check every 30 seconds if canceled */
+ while (wtime > 0) {
+ Dmsg2(100, "Waiting on sched time, jobid=%d secs=%d\n", jcr->JobId, wtime);
+ if (wtime > 30) {
+ wtime = 30;
+ }
+ bmicrosleep(wtime, 0);
+ if (job_canceled(jcr)) {
+ return 0;
+ }
+ wtime = jcr->sched_time - time(NULL);
+ }
+
+
+#ifdef USE_SEMAPHORE
+ int stat;
+
+ /* Initialize semaphores */
+ if (jcr->store->sem.valid != SEMLOCK_VALID) {
+ if ((stat = sem_init(&jcr->store->sem, jcr->store->MaxConcurrentJobs)) != 0) {
+ Emsg1(M_ABORT, 0, _("Could not init Storage semaphore: ERR=%s\n"), strerror(stat));
+ }
+ }
+ if (jcr->client->sem.valid != SEMLOCK_VALID) {
+ if ((stat = sem_init(&jcr->client->sem, jcr->client->MaxConcurrentJobs)) != 0) {
+ Emsg1(M_ABORT, 0, _("Could not init Client semaphore: ERR=%s\n"), strerror(stat));
+ }
+ }
+ if (jcr->job->sem.valid != SEMLOCK_VALID) {
+ if ((stat = sem_init(&jcr->job->sem, jcr->job->MaxConcurrentJobs)) != 0) {
+ Emsg1(M_ABORT, 0, _("Could not init Job semaphore: ERR=%s\n"), strerror(stat));
+ }
+ }
+
+ for ( ;; ) {
+ /* Acquire semaphore */
+ set_jcr_job_status(jcr, JS_WaitJobRes);
+ if ((stat = sem_lock(&jcr->job->sem)) != 0) {
+ Emsg1(M_ABORT, 0, _("Could not acquire Job max jobs lock: ERR=%s\n"), strerror(stat));
+ }
+ set_jcr_job_status(jcr, JS_WaitClientRes);
+ if ((stat = sem_trylock(&jcr->client->sem)) != 0) {
+ if (stat == EBUSY) {
+ backoff_resource_locks(jcr, 1);
+ goto wait;
+ } else {
+ Emsg1(M_ABORT, 0, _("Could not acquire Client max jobs lock: ERR=%s\n"), strerror(stat));
+ }
+ }
+ set_jcr_job_status(jcr, JS_WaitStoreRes);
+ if ((stat = sem_trylock(&jcr->store->sem)) != 0) {
+ if (stat == EBUSY) {
+ backoff_resource_locks(jcr, 2);
+ goto wait;
+ } else {
+ Emsg1(M_ABORT, 0, _("Could not acquire Storage max jobs lock: ERR=%s\n"), strerror(stat));
+ }
+ }
+ set_jcr_job_status(jcr, JS_WaitMaxJobs);
+ if ((stat = sem_trylock(&job_lock)) != 0) {
+ if (stat == EBUSY) {
+ backoff_resource_locks(jcr, 3);
+ goto wait;
+ } else {
+ Emsg1(M_ABORT, 0, _("Could not acquire max jobs lock: ERR=%s\n"), strerror(stat));
+ }
+ }
+ break;
+
+wait:
+ if (job_canceled(jcr)) {
+ return 0;
+ }
+ P(mutex);
+ /*
+ * Wait for a resource to be released either by backoff or
+ * by a job terminating.
+ */
+ waiting++;
+ pthread_cond_wait(&resource_wait, &mutex);
+ waiting--;
+ V(mutex);
+ /* Try again */
+ }
+ jcr->acquired_resource_locks = 1;
+#endif
+ return 1;
+}
+
+#ifdef USE_SEMAPHORE
+/*
+ * We could not get all the resource locks because
+ * too many jobs are running, so release any locks
+ * we did acquire, giving others a chance to use them
+ * while we wait.
+ */
+static void backoff_resource_locks(JCR *jcr, int count)
+{
+ P(mutex);
+ switch (count) {
+ case 3:
+ sem_unlock(&jcr->store->sem);
+ /* Fall through wanted */
+ case 2:
+ sem_unlock(&jcr->client->sem);
+ /* Fall through wanted */
+ case 1:
+ sem_unlock(&jcr->job->sem);
+ break;
+ }
+ /*
+ * Since we released a lock, if there are any threads
+ * waiting, wake them up so that they can try again.
+ */
+ if (waiting > 0) {
+ pthread_cond_broadcast(&resource_wait);
+ }
+ V(mutex);
+}
+#endif
+
+/*
+ * This is called at the end of the job to release
+ * any resource limits on the number of jobs. If
+ * there are any other jobs waiting, we wake them
+ * up so that they can try again.
+ */
+static void release_resource_locks(JCR *jcr)
+{
+ if (!jcr->acquired_resource_locks) {
+ return; /* Job canceled, no locks acquired */
+ }
+#ifdef USE_SEMAPHORE
+ P(mutex);
+ sem_unlock(&jcr->store->sem);
+ sem_unlock(&jcr->client->sem);
+ sem_unlock(&jcr->job->sem);
+ sem_unlock(&job_lock);
+ if (waiting > 0) {
+ pthread_cond_broadcast(&resource_wait);
+ }
+ jcr->acquired_resource_locks = 0;
+ V(mutex);
+#endif
}
/*
CLIENT_DBR cr;
memset(&cr, 0, sizeof(cr));
- strcpy(cr.Name, jcr->client->hdr.name);
+ bstrncpy(cr.Name, jcr->client->hdr.name, sizeof(cr.Name));
cr.AutoPrune = jcr->client->AutoPrune;
cr.FileRetention = jcr->client->FileRetention;
cr.JobRetention = jcr->client->JobRetention;
- if (jcr->client_name) {
- free(jcr->client_name);
+ if (!jcr->client_name) {
+ jcr->client_name = get_pool_memory(PM_NAME);
}
- jcr->client_name = bstrdup(jcr->client->hdr.name);
- if (!db_create_client_record(jcr->db, &cr)) {
- Jmsg(jcr, M_ERROR, 0, _("Could not create Client record. %s"),
+ pm_strcpy(&jcr->client_name, jcr->client->hdr.name);
+ if (!db_create_client_record(jcr, jcr->db, &cr)) {
+ Jmsg(jcr, M_FATAL, 0, _("Could not create Client record. ERR=%s\n"),
db_strerror(jcr->db));
return 0;
}
jcr->jr.ClientId = cr.ClientId;
- Dmsg2(9, "Created Client %s record %d\n", jcr->client->hdr.name,
+ if (cr.Uname[0]) {
+ if (!jcr->client_uname) {
+ jcr->client_uname = get_pool_memory(PM_NAME);
+ }
+ pm_strcpy(&jcr->client_uname, cr.Uname);
+ }
+ Dmsg2(100, "Created Client %s record %d\n", jcr->client->hdr.name,
jcr->jr.ClientId);
return 1;
}
jcr->jr.JobBytes = jcr->JobBytes;
jcr->jr.VolSessionId = jcr->VolSessionId;
jcr->jr.VolSessionTime = jcr->VolSessionTime;
- if (!db_update_job_end_record(jcr->db, &jcr->jr)) {
+ if (!db_update_job_end_record(jcr, jcr->db, &jcr->jr)) {
Jmsg(jcr, M_WARNING, 0, _("Error updating job record. %s"),
db_strerror(jcr->db));
}
* thus unique Job Name
*/
P(mutex); /* lock creation of jobs */
- time(&now);
+ now = time(NULL);
while (now == last_start_time) {
- sleep(1);
- time(&now);
+ bmicrosleep(0, 500000);
+ now = time(NULL);
}
last_start_time = now;
V(mutex); /* allow creation of jobs */
jcr->start_time = now;
/* Form Unique JobName */
localtime_r(&now, &tm);
- strftime(dt, sizeof(dt), "%Y-%m-%d.%H:%M:%S", &tm);
- strncpy(name, base_name, sizeof(name));
+ /* Use only characters that are permitted in Windows filenames */
+ strftime(dt, sizeof(dt), "%Y-%m-%d_%H.%M.%S", &tm);
+ bstrncpy(name, base_name, sizeof(name));
name[sizeof(name)-22] = 0; /* truncate if too long */
- sprintf(jcr->Job, "%s.%s", name, dt); /* add date & time */
+ bsnprintf(jcr->Job, sizeof(jcr->Job), "%s.%s", name, dt); /* add date & time */
/* Convert spaces into underscores */
for (p=jcr->Job; *p; p++) {
if (*p == ' ') {
{
Dmsg0(200, "Start dird free_jcr\n");
+ if (jcr->sd_auth_key) {
+ free(jcr->sd_auth_key);
+ jcr->sd_auth_key = NULL;
+ }
+ if (jcr->where) {
+ free(jcr->where);
+ jcr->where = NULL;
+ }
if (jcr->file_bsock) {
Dmsg0(200, "Close File bsock\n");
bnet_close(jcr->file_bsock);
+ jcr->file_bsock = NULL;
}
if (jcr->store_bsock) {
Dmsg0(200, "Close Store bsock\n");
bnet_close(jcr->store_bsock);
+ jcr->store_bsock = NULL;
}
if (jcr->fname) {
Dmsg0(200, "Free JCR fname\n");
free_pool_memory(jcr->fname);
+ jcr->fname = NULL;
}
if (jcr->stime) {
Dmsg0(200, "Free JCR stime\n");
free_pool_memory(jcr->stime);
+ jcr->stime = NULL;
}
- if (jcr->db) {
- Dmsg0(200, "Close DB\n");
- db_close_database(jcr->db);
+ if (jcr->RestoreBootstrap) {
+ free(jcr->RestoreBootstrap);
+ jcr->RestoreBootstrap = NULL;
}
- if (jcr->RestoreWhere) {
- free(jcr->RestoreWhere);
+ if (jcr->client_uname) {
+ free_pool_memory(jcr->client_uname);
+ jcr->client_uname = NULL;
}
Dmsg0(200, "End dird free_jcr\n");
}
{
jcr->job = job;
jcr->JobType = job->JobType;
- jcr->level = job->level;
+ jcr->JobLevel = job->level;
jcr->store = job->storage;
jcr->client = job->client;
- if (jcr->client_name) {
- free(jcr->client_name);
+ if (!jcr->client_name) {
+ jcr->client_name = get_pool_memory(PM_NAME);
}
- jcr->client_name = bstrdup(job->client->hdr.name);
+ pm_strcpy(&jcr->client_name, jcr->client->hdr.name);
jcr->pool = job->pool;
jcr->catalog = job->client->catalog;
- jcr->fileset = job->fs;
- init_msg(jcr, job->messages);
+ jcr->fileset = job->fileset;
+ jcr->messages = job->messages;
+ if (jcr->RestoreBootstrap) {
+ free(jcr->RestoreBootstrap);
+ }
+ /* This can be overridden by Console program */
+ if (job->RestoreBootstrap) {
+ jcr->RestoreBootstrap = bstrdup(job->RestoreBootstrap);
+ }
/* If no default level given, set one */
- if (jcr->level == 0) {
+ if (jcr->JobLevel == 0) {
switch (jcr->JobType) {
case JT_VERIFY:
- jcr->level = L_VERIFY_CATALOG;
+ jcr->JobLevel = L_VERIFY_CATALOG;
break;
case JT_BACKUP:
- jcr->level = L_INCREMENTAL;
+ jcr->JobLevel = L_INCREMENTAL;
+ break;
+ case JT_RESTORE:
+ case JT_ADMIN:
+ jcr->JobLevel = L_FULL;
break;
default:
break;
}
}
}
+
+/*
+ * Edit codes into Run command
+ * %% = %
+ * %c = Client's name
+ * %d = Director's name
+ * %i = JobId
+ * %e = Job Exit
+ * %j = Job
+ * %l = Job Level
+ * %n = Job name
+ * %t = Job type
+ *
+ * omsg = edited output message
+ * imsg = input string containing edit codes (%x)
+ *
+ */
+static char *edit_run_codes(JCR *jcr, char *omsg, char *imsg)
+{
+ char *p;
+ const char *str;
+ char add[20];
+
+ *omsg = 0;
+ Dmsg1(200, "edit_run_codes: %s\n", imsg);
+ for (p=imsg; *p; p++) {
+ if (*p == '%') {
+ switch (*++p) {
+ case '%':
+ str = "%";
+ break;
+ case 'c':
+ str = jcr->client_name;
+ if (!str) {
+ str = "";
+ }
+ break;
+ case 'd':
+ str = my_name;
+ break;
+ case 'e':
+ str = job_status_to_str(jcr->JobStatus);
+ break;
+ case 'i':
+ sprintf(add, "%d", jcr->JobId);
+ str = add;
+ break;
+ case 'j': /* Job */
+ str = jcr->Job;
+ break;
+ case 'l':
+ str = job_level_to_str(jcr->JobLevel);
+ break;
+ case 'n':
+ str = jcr->job->hdr.name;
+ break;
+ case 't':
+ str = job_type_to_str(jcr->JobType);
+ break;
+ default:
+ add[0] = '%';
+ add[1] = *p;
+ add[2] = 0;
+ str = add;
+ break;
+ }
+ } else {
+ add[0] = *p;
+ add[1] = 0;
+ str = add;
+ }
+ Dmsg1(200, "add_str %s\n", str);
+ pm_strcat(&omsg, (char *)str);
+ Dmsg1(200, "omsg=%s\n", omsg);
+ }
+ return omsg;
+}