-/*
- *
- * Bacula Director Job processing routines
- *
- * Kern Sibbald, October MM
- *
- * Version $Id$
- */
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2008 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 two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ 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
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
+/*
+ *
+ * Bacula Director Job processing routines
+ *
+ * Kern Sibbald, October MM
+ *
+ * Version $Id$
+ */
#include "bacula.h"
#include "dird.h"
if ((stat = jobq_init(&job_queue, max_workers, job_thread)) != 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("Could not init job queue: ERR=%s\n"), be.strerror(stat));
+ Emsg1(M_ABORT, 0, _("Could not init job queue: ERR=%s\n"), be.bstrerror(stat));
}
wd = new_watchdog();
wd->callback = job_monitor_watchdog;
/* Queue the job to be run */
if ((stat = jobq_add(&job_queue, jcr)) != 0) {
berrno be;
- Jmsg(jcr, M_FATAL, 0, _("Could not add job queue: ERR=%s\n"), be.strerror(stat));
+ Jmsg(jcr, M_FATAL, 0, _("Could not add job queue: ERR=%s\n"), be.bstrerror(stat));
return 0;
}
return jcr->JobId;
/* Initialize termination condition variable */
if ((errstat = 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(errstat));
+ Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), be.bstrerror(errstat));
goto bail_out;
}
jcr->term_wait_inited = true;
/*
* Open database
*/
- Dmsg0(50, "Open database\n");
- 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,
- jcr->catalog->mult_db_connections);
+ Dmsg0(100, "Open database\n");
+ jcr->db=db_init(jcr, jcr->catalog->db_driver, jcr->catalog->db_name,
+ jcr->catalog->db_user,
+ jcr->catalog->db_password, jcr->catalog->db_address,
+ jcr->catalog->db_port, jcr->catalog->db_socket,
+ jcr->catalog->mult_db_connections);
if (!jcr->db || !db_open_database(jcr, jcr->db)) {
Jmsg(jcr, M_FATAL, 0, _("Could not open database \"%s\".\n"),
jcr->catalog->db_name);
if (jcr->db) {
Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
+ db_close_database(jcr, jcr->db);
}
goto bail_out;
}
- Dmsg0(50, "DB opened\n");
+ Dmsg0(150, "DB opened\n");
if (!jcr->fname) {
jcr->fname = get_pool_memory(PM_FNAME);
pm_strcpy(jcr->pool_source, _("unknown source"));
}
Dmsg2(500, "pool=%s (From %s)\n", jcr->pool->name(), jcr->pool_source);
- if (jcr->JobType == JT_MIGRATE) {
+ if (jcr->JobType == JT_MIGRATE || jcr->JobType == JT_COPY) {
if (!jcr->rpool_source) {
jcr->rpool_source = get_pool_memory(PM_MESSAGE);
pm_strcpy(jcr->rpool_source, _("unknown source"));
* Create Job record
*/
init_jcr_job_record(jcr);
+ if (!get_or_create_client_record(jcr)) {
+ goto bail_out;
+ }
+
if (!db_create_job_record(jcr, jcr->db, &jcr->jr)) {
Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
goto bail_out;
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;
- }
-
generate_daemon_event(jcr, "JobStart");
if (job_canceled(jcr)) {
admin_cleanup(jcr, JS_ErrorTerminated);
}
break;
+ case JT_COPY:
case JT_MIGRATE:
if (!do_migration_init(jcr)) {
migration_cleanup(jcr, JS_ErrorTerminated);
}
generate_job_event(jcr, "JobInit");
+ Dsm_check(1);
return true;
bail_out:
{
dequeue_messages(jcr); /* display any queued messages */
set_jcr_job_status(jcr, TermCode);
- run_scripts(jcr, jcr->job->RunScripts, "AfterJob");
update_job_end_record(jcr);
}
{
JCR *jcr = (JCR *)arg;
- jcr->my_thread_id = pthread_self();
- pthread_detach(jcr->my_thread_id);
- sm_check(__FILE__, __LINE__, true);
+ pthread_detach(pthread_self());
+ Dsm_check(1);
Dmsg0(200, "=====Start Job=========\n");
set_jcr_job_status(jcr, JS_Running); /* this will be set only if no error */
admin_cleanup(jcr, JS_ErrorTerminated);
}
break;
- case JT_MIGRATE:
case JT_COPY:
- case JT_ARCHIVE:
+ case JT_MIGRATE:
if (do_migration(jcr)) {
do_autoprune(jcr);
} else {
Pmsg1(0, _("Unimplemented job type: %d\n"), jcr->JobType);
break;
}
+ }
- /* Send off any queued messages */
- if (jcr->msg_queue && jcr->msg_queue->size() > 0) {
- dequeue_messages(jcr);
- }
+ run_scripts(jcr, jcr->job->RunScripts, "AfterJob");
+
+ /* Send off any queued messages */
+ if (jcr->msg_queue && jcr->msg_queue->size() > 0) {
+ dequeue_messages(jcr);
}
generate_daemon_event(jcr, "JobEnd");
case JS_WaitPriority:
case JS_WaitMaxJobs:
case JS_WaitStartTime:
- bsendmsg(ua, _("JobId %s, Job %s marked to be canceled.\n"),
+ ua->info_msg(_("JobId %s, Job %s marked to be canceled.\n"),
edit_uint64(jcr->JobId, ed1), jcr->Job);
jobq_remove(&job_queue, jcr); /* attempt to remove it from queue */
return true;
if (jcr->file_bsock) {
ua->jcr->client = jcr->client;
if (!connect_to_file_daemon(ua->jcr, 10, FDConnectTimeout, 1)) {
- bsendmsg(ua, _("Failed to connect to File daemon.\n"));
+ ua->error_msg(_("Failed to connect to File daemon.\n"));
return 0;
}
Dmsg0(200, "Connected to file daemon\n");
fd = ua->jcr->file_bsock;
bnet_fsend(fd, "cancel Job=%s\n", jcr->Job);
while (bnet_recv(fd) >= 0) {
- bsendmsg(ua, "%s", fd->msg);
+ ua->send_msg("%s", fd->msg);
}
bnet_sig(fd, BNET_TERMINATE);
bnet_close(fd);
USTORE store;
if (jcr->rstorage) {
store.store = jcr->rstore;
- pm_strcpy(store.store_source, jcr->rstore_source);
} else {
store.store = jcr->wstore;
- pm_strcpy(store.store_source, jcr->wstore_source);
}
set_wstorage(ua->jcr, &store);
}
if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
- bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
+ ua->error_msg(_("Failed to connect to Storage daemon.\n"));
return false;
}
Dmsg0(200, "Connected to storage daemon\n");
sd = ua->jcr->store_bsock;
- bnet_fsend(sd, "cancel Job=%s\n", jcr->Job);
- while (bnet_recv(sd) >= 0) {
- bsendmsg(ua, "%s", sd->msg);
+ sd->fsend("cancel Job=%s\n", jcr->Job);
+ while (sd->recv() >= 0) {
+ ua->send_msg("%s", sd->msg);
}
- bnet_sig(sd, BNET_TERMINATE);
- bnet_close(sd);
+ sd->signal(BNET_TERMINATE);
+ sd->close();
ua->jcr->store_bsock = NULL;
}
}
return true;
}
+void cancel_storage_daemon_job(JCR *jcr)
+{
+ UAContext *ua = new_ua_context(jcr);
+ JCR *control_jcr = new_control_jcr("*JobCancel*", JT_SYSTEM);
+ BSOCK *sd;
+
+ ua->jcr = control_jcr;
+ if (jcr->store_bsock) {
+ if (!ua->jcr->wstorage) {
+ if (jcr->rstorage) {
+ copy_wstorage(ua->jcr, jcr->rstorage, _("Job resource"));
+ } else {
+ copy_wstorage(ua->jcr, jcr->wstorage, _("Job resource"));
+ }
+ } else {
+ USTORE store;
+ if (jcr->rstorage) {
+ store.store = jcr->rstore;
+ } else {
+ store.store = jcr->wstore;
+ }
+ set_wstorage(ua->jcr, &store);
+ }
+
+ if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
+ goto bail_out;
+ }
+ Dmsg0(200, "Connected to storage daemon\n");
+ sd = ua->jcr->store_bsock;
+ sd->fsend("cancel Job=%s\n", jcr->Job);
+ while (sd->recv() >= 0) {
+ }
+ sd->signal(BNET_TERMINATE);
+ sd->close();
+ ua->jcr->store_bsock = NULL;
+ }
+bail_out:
+ free_jcr(control_jcr);
+ free_ua_context(ua);
+}
static void job_monitor_destructor(watchdog_t *self)
{
control_jcr = (JCR *)self->data;
+ Dsm_check(1);
Dmsg1(800, "job_monitor_watchdog %p called\n", self);
foreach_jcr(jcr) {
- bool cancel;
+ bool cancel = false;
if (jcr->JobId == 0 || job_canceled(jcr)) {
Dmsg2(800, "Skipping JCR=%p Job=%s\n", jcr, jcr->Job);
static bool job_check_maxwaittime(JCR *control_jcr, JCR *jcr)
{
bool cancel = false;
- bool ok_to_cancel = false;
JOB *job = jcr->job;
if (job_canceled(jcr)) {
}
if (jcr->JobLevel == L_FULL && job->FullMaxWaitTime != 0 &&
(watchdog_time - jcr->start_time) >= job->FullMaxWaitTime) {
- ok_to_cancel = true;
+ cancel = true;
} else if (jcr->JobLevel == L_DIFFERENTIAL && job->DiffMaxWaitTime != 0 &&
(watchdog_time - jcr->start_time) >= job->DiffMaxWaitTime) {
- ok_to_cancel = true;
+ cancel = true;
} else if (jcr->JobLevel == L_INCREMENTAL && job->IncMaxWaitTime != 0 &&
(watchdog_time - jcr->start_time) >= job->IncMaxWaitTime) {
- ok_to_cancel = true;
+ cancel = true;
} else if (job->MaxWaitTime != 0 &&
(watchdog_time - jcr->start_time) >= job->MaxWaitTime) {
- ok_to_cancel = true;
- }
- if (!ok_to_cancel) {
- return false;
- }
-
-/*
- * I don't see the need for all this -- kes 17Dec06
- */
-#ifdef xxx
- Dmsg3(800, "Job %d (%s): MaxWaitTime of %d seconds exceeded, "
- "checking status\n",
- jcr->JobId, jcr->Job, job->MaxWaitTime);
- switch (jcr->JobStatus) {
- case JS_Created:
- case JS_Blocked:
- case JS_WaitFD:
- case JS_WaitSD:
- case JS_WaitStoreRes:
- case JS_WaitClientRes:
- case JS_WaitJobRes:
- case JS_WaitPriority:
- case JS_WaitMaxJobs:
- case JS_WaitStartTime:
cancel = true;
- Dmsg0(200, "JCR blocked in #1\n");
- break;
- case JS_Running:
- Dmsg0(800, "JCR running, checking SD status\n");
- switch (jcr->SDJobStatus) {
- case JS_WaitMount:
- case JS_WaitMedia:
- case JS_WaitFD:
- cancel = true;
- Dmsg0(800, "JCR blocked in #2\n");
- break;
- default:
- Dmsg0(800, "JCR not blocked in #2\n");
- break;
- }
- break;
- case JS_Terminated:
- case JS_ErrorTerminated:
- case JS_Canceled:
- case JS_FatalError:
- Dmsg0(800, "JCR already dead in #3\n");
- break;
- default:
- Jmsg1(jcr, M_ERROR, 0, _("Unhandled job status code %d\n"),
- jcr->JobStatus);
}
- Dmsg3(800, "MaxWaitTime result: %scancel JCR %p (%s)\n",
- cancel ? "" : "do not ", jcr, jcr->job);
-#endif
+
return cancel;
}
*/
static bool job_check_maxruntime(JCR *control_jcr, JCR *jcr)
{
- bool cancel = false;
-
- if (jcr->job->MaxRunTime == 0 || job_canceled(jcr)) {
+ if (jcr->job->MaxRunTime == 0 || job_canceled(jcr) || jcr->JobStatus == JS_Created) {
return false;
}
if ((watchdog_time - jcr->start_time) < jcr->job->MaxRunTime) {
return false;
}
-#ifdef xxx
- switch (jcr->JobStatus) {
- case JS_Created:
- case JS_Running:
- case JS_Blocked:
- case JS_WaitFD:
- case JS_WaitSD:
- case JS_WaitStoreRes:
- case JS_WaitClientRes:
- case JS_WaitJobRes:
- case JS_WaitPriority:
- case JS_WaitMaxJobs:
- case JS_WaitStartTime:
- case JS_Differences:
- cancel = true;
- break;
- case JS_Terminated:
- case JS_ErrorTerminated:
- case JS_Canceled:
- case JS_FatalError:
- cancel = false;
- break;
- default:
- Jmsg1(jcr, M_ERROR, 0, _("Unhandled job status code %d\n"),
- jcr->JobStatus);
- }
-
- Dmsg3(200, "MaxRunTime result: %scancel JCR %p (%s)\n",
- cancel ? "" : "do not ", jcr, jcr->job);
-#endif
- return cancel;
+ return true;
}
/*
memset(&pr, 0, sizeof(pr));
bstrncpy(pr.Name, pool_name, sizeof(pr.Name));
- Dmsg1(010, "get_or_create_pool=%s\n", pool_name);
+ Dmsg1(110, "get_or_create_pool=%s\n", pool_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,
+ Jmsg(jcr, M_FATAL, 0, _("Pool \"%s\" not in database. ERR=%s"), pr.Name,
db_strerror(jcr->db));
return 0;
} else {
- Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name);
+ Jmsg(jcr, M_INFO, 0, _("Created database record for Pool \"%s\".\n"), pr.Name);
}
}
return pr.PoolId;
}
+/*
+ * Check for duplicate jobs.
+ * Returns: true if current job should continue
+ * false if current job should terminate
+ */
+bool allow_duplicate_job(JCR *jcr)
+{
+ JOB *job = jcr->job;
+ JCR *djcr; /* possible duplicate */
+
+ if (job->AllowDuplicateJobs) {
+ return true;
+ }
+ if (!job->AllowHigherDuplicates) {
+ foreach_jcr(djcr) {
+ if (strcmp(job->name(), djcr->job->name()) == 0) {
+ bool cancel_queued = false;
+ if (job->DuplicateJobProximity > 0) {
+ time_t now = time(NULL);
+ if ((now - djcr->start_time) > job->DuplicateJobProximity) {
+ continue; /* not really a duplicate */
+ }
+ }
+ /* Cancel */
+ if (!(job->CancelQueuedDuplicates || job->CancelRunningDuplicates)) {
+ /* Zap current job */
+ Jmsg(jcr, M_FATAL, 0, _("Duplicate job not allowed.\n"));
+ return false;
+ }
+ /* If CancelQueuedDuplicates is set do so only if job is queued */
+ if (job->CancelQueuedDuplicates) {
+ switch (djcr->JobStatus) {
+ case JS_Created:
+ case JS_WaitJobRes:
+ case JS_WaitClientRes:
+ case JS_WaitStoreRes:
+ case JS_WaitPriority:
+ case JS_WaitMaxJobs:
+ case JS_WaitStartTime:
+ cancel_queued = true;
+ break;
+ default:
+ break;
+ }
+ }
+ if (cancel_queued || job->CancelRunningDuplicates) {
+ UAContext *ua = new_ua_context(djcr);
+ char ec1[50];
+ Jmsg(jcr, M_INFO, 0, _("Cancelling duplicate JobId=%s.\n"),
+ edit_uint64(djcr->JobId, ec1));
+ ua->jcr = djcr;
+ cancel_job(ua, djcr);
+ free_ua_context(ua);
+ Dmsg2(800, "Have cancelled JCR %p Job=%d\n", djcr, djcr->JobId);
+ }
+ }
+ }
+ }
+ return true;
+}
+
void apply_pool_overrides(JCR *jcr)
{
+ bool pool_override = false;
+
if (jcr->run_pool_override) {
pm_strcpy(jcr->pool_source, _("Run pool override"));
}
case L_FULL:
if (jcr->full_pool) {
jcr->pool = jcr->full_pool;
+ pool_override = true;
if (jcr->run_full_pool_override) {
pm_strcpy(jcr->pool_source, _("Run FullPool override"));
} else {
case L_INCREMENTAL:
if (jcr->inc_pool) {
jcr->pool = jcr->inc_pool;
+ pool_override = true;
if (jcr->run_inc_pool_override) {
pm_strcpy(jcr->pool_source, _("Run IncPool override"));
} else {
case L_DIFFERENTIAL:
if (jcr->diff_pool) {
jcr->pool = jcr->diff_pool;
+ pool_override = true;
if (jcr->run_diff_pool_override) {
pm_strcpy(jcr->pool_source, _("Run DiffPool override"));
} else {
}
break;
}
+ /* Update catalog if pool overridden */
+ if (pool_override && jcr->pool->catalog) {
+ jcr->catalog = jcr->pool->catalog;
+ pm_strcpy(jcr->catalog_source, _("Pool resource"));
+ }
}
* Takes base_name and appends (unique) current
* date and time to form unique job name.
*
+ * Note, the seconds are actually a sequence number. This
+ * permits us to start a maximum fo 59 unique jobs a second, which
+ * should be sufficient.
+ *
* Returns: unique job name in jcr->Job
* date/time in jcr->start_time
*/
/* Job start mutex */
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static time_t last_start_time = 0;
+ static int seq = 0;
time_t now;
struct tm tm;
char dt[MAX_TIME_LENGTH];
*/
P(mutex); /* lock creation of jobs */
now = time(NULL);
- while (now == last_start_time) {
- bmicrosleep(0, 500000);
- now = time(NULL);
+ seq++;
+ if (seq > 59) { /* wrap as if it is seconds */
+ seq = 0;
+ while (now == last_start_time) {
+ bmicrosleep(0, 500000);
+ now = time(NULL);
+ }
}
last_start_time = now;
V(mutex); /* allow creation of jobs */
/* Form Unique JobName */
(void)localtime_r(&now, &tm);
/* Use only characters that are permitted in Windows filenames */
- strftime(dt, sizeof(dt), "%Y-%m-%d_%H.%M.%S", &tm);
+ strftime(dt, sizeof(dt), "%Y-%m-%d_%H.%M", &tm);
bstrncpy(name, base_name, sizeof(name));
name[sizeof(name)-22] = 0; /* truncate if too long */
- bsnprintf(jcr->Job, sizeof(jcr->Job), "%s.%s", name, dt); /* add date & time */
+ bsnprintf(jcr->Job, sizeof(jcr->Job), "%s.%s.%02d", name, dt, seq); /* add date & time */
/* Convert spaces into underscores */
for (p=jcr->Job; *p; p++) {
if (*p == ' ') {
free_pool_memory(jcr->fname);
jcr->fname = NULL;
}
- if (jcr->pool_source) {
- free_pool_memory(jcr->pool_source);
- jcr->pool_source = NULL;
- }
- if (jcr->rpool_source) {
- free_pool_memory(jcr->rpool_source);
- jcr->rpool_source = NULL;
- }
- if (jcr->wstore_source) {
- free_pool_memory(jcr->wstore_source);
- jcr->wstore_source = NULL;
- }
- if (jcr->rstore_source) {
- free_pool_memory(jcr->rstore_source);
- jcr->rstore_source = NULL;
- }
- if (jcr->stime) {
- Dmsg0(200, "Free JCR stime\n");
- free_pool_memory(jcr->stime);
- jcr->stime = NULL;
- }
if (jcr->RestoreBootstrap) {
free(jcr->RestoreBootstrap);
jcr->RestoreBootstrap = NULL;
pthread_cond_destroy(&jcr->term_wait);
jcr->term_wait_inited = false;
}
+ if (jcr->db_batch && jcr->db_batch != jcr->db) {
+ db_close_database(jcr, jcr->db_batch);
+ }
+ jcr->db_batch = NULL;
+ if (jcr->db) {
+ db_close_database(jcr, jcr->db);
+ jcr->db = NULL;
+ }
+ if (jcr->stime) {
+ Dmsg0(200, "Free JCR stime\n");
+ free_pool_memory(jcr->stime);
+ jcr->stime = NULL;
+ }
+ if (jcr->fname) {
+ Dmsg0(200, "Free JCR fname\n");
+ free_pool_memory(jcr->fname);
+ jcr->fname = NULL;
+ }
+ if (jcr->pool_source) {
+ free_pool_memory(jcr->pool_source);
+ jcr->pool_source = NULL;
+ }
+ if (jcr->catalog_source) {
+ free_pool_memory(jcr->catalog_source);
+ jcr->catalog_source = NULL;
+ }
+ if (jcr->rpool_source) {
+ free_pool_memory(jcr->rpool_source);
+ jcr->rpool_source = NULL;
+ }
+ if (jcr->wstore_source) {
+ free_pool_memory(jcr->wstore_source);
+ jcr->wstore_source = NULL;
+ }
+ if (jcr->rstore_source) {
+ free_pool_memory(jcr->rstore_source);
+ jcr->rstore_source = NULL;
+ }
/* Delete lists setup to hold storage pointers */
free_rwstorage(jcr);
jcr->job_end_push.destroy();
+
+ if (jcr->JobId != 0)
+ write_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
+
Dmsg0(200, "End dird free_jcr\n");
}
{
jcr->job = job;
jcr->JobType = job->JobType;
+ jcr->JobStatus = JS_Created;
switch (jcr->JobType) {
case JT_ADMIN:
case JT_RESTORE:
jcr->JobLevel = L_NONE;
break;
+ case JT_COPY:
+ case JT_MIGRATE:
+ if (!jcr->rpool_source) {
+ jcr->rpool_source = get_pool_memory(PM_MESSAGE);
+ pm_strcpy(jcr->rpool_source, _("unknown source"));
+ }
+ /* Fall-through wanted */
default:
jcr->JobLevel = job->JobLevel;
break;
jcr->pool_source = get_pool_memory(PM_MESSAGE);
pm_strcpy(jcr->pool_source, _("unknown source"));
}
+ if (!jcr->catalog_source) {
+ jcr->catalog_source = get_pool_memory(PM_MESSAGE);
+ pm_strcpy(jcr->catalog_source, _("unknown source"));
+ }
+
jcr->JobPriority = job->Priority;
/* Copy storage definitions -- deleted in dir_free_jcr above */
if (job->storage) {
jcr->full_pool = job->full_pool;
jcr->inc_pool = job->inc_pool;
jcr->diff_pool = job->diff_pool;
- jcr->catalog = job->client->catalog;
+ if (job->pool->catalog) {
+ jcr->catalog = job->pool->catalog;
+ pm_strcpy(jcr->catalog_source, _("Pool resource"));
+ } else {
+ jcr->catalog = job->client->catalog;
+ pm_strcpy(jcr->catalog_source, _("Client resource"));
+ }
jcr->fileset = job->fileset;
jcr->messages = job->messages;
jcr->spool_data = job->spool_data;
+ jcr->spool_size = job->spool_size;
jcr->write_part_after_job = job->write_part_after_job;
+ jcr->accurate = job->accurate;
if (jcr->RestoreBootstrap) {
free(jcr->RestoreBootstrap);
jcr->RestoreBootstrap = NULL;
switch(jcr->JobType) {
case JT_RESTORE:
case JT_VERIFY:
+ case JT_COPY:
case JT_MIGRATE:
copy_rstorage(jcr, storage, where);
break;
}
-/* Set storage override */
+/* Set storage override. Releases any previous storage definition */
void set_rwstorage(JCR *jcr, USTORE *store)
{
if (!store) {
switch(jcr->JobType) {
case JT_RESTORE:
case JT_VERIFY:
+ case JT_COPY:
case JT_MIGRATE:
set_rstorage(jcr, store);
break;
}
-/* Set storage override */
+/* Set storage override. Remove all previous storage */
void set_rstorage(JCR *jcr, USTORE *store)
{
STORE *storage;
if (!store->store) {
return;
}
+ if (jcr->rstorage) {
+ free_rstorage(jcr);
+ }
if (!jcr->rstorage) {
jcr->rstorage = New(alist(10, not_owned_by_alist));
}
}
jcr->wstorage = New(alist(10, not_owned_by_alist));
foreach_alist(st, storage) {
- Dmsg1(50, "storage=%s\n", st->name());
+ Dmsg1(100, "wstorage=%s\n", st->name());
jcr->wstorage->append(st);
}
if (!jcr->wstore_source) {
}
-/* Set storage override */
+/* Set storage override. Remove all previous storage */
void set_wstorage(JCR *jcr, USTORE *store)
{
STORE *storage;
if (!store->store) {
return;
}
+ if (jcr->wstorage) {
+ free_wstorage(jcr);
+ }
if (!jcr->wstorage) {
jcr->wstorage = New(alist(10, not_owned_by_alist));
}
UAContext *ua;
memset(&rx, 0, sizeof(rx));
rx.bsr = new_bsr();
- rx.JobIds = "";
+ rx.JobIds = (char *)"";
rx.bsr->JobId = jcr->previous_jr.JobId;
ua = new_ua_context(jcr);
complete_bsr(ua, rx.bsr);
jcr->needs_sd = true;
return true;
}
+
+bool run_console_command(JCR *jcr, const char *cmd){
+ UAContext *ua;
+ bool ok;
+
+ ua = new_ua_context(jcr);
+ Mmsg(ua->cmd, "%s", cmd);
+ Dmsg1(100, "Console command: %s\n", ua->cmd);
+ parse_ua_args(ua);
+ ok= do_a_command(ua);
+ free_ua_context(ua);
+ return ok;
+}
projects / bacula / bacula / blobdiff