/*
Bacula® - The Network Backup Solution
- Copyright (C) 2004-2008 Free Software Foundation Europe e.V.
+ Copyright (C) 2004-2009 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.
static const int dbglevel = 10;
-static char OKbootstrap[] = "3000 OK bootstrap\n";
static int get_job_to_migrate(JCR *jcr);
struct idpkt;
static bool regex_find_jobids(JCR *jcr, idpkt *ids, const char *query1,
static bool find_jobids_of_pool_uncopied_jobs(JCR *jcr, idpkt *ids);
static void start_migration_job(JCR *jcr);
static int get_next_dbid_from_list(char **p, DBId_t *DBId);
+static bool set_migration_next_pool(JCR *jcr, POOL **pool);
/*
* Called here before the job is run to do the job
*/
bool do_migration_init(JCR *jcr)
{
- POOL_DBR pr;
- POOL *pool;
- char ed1[100];
+ POOL *pool = NULL;
JOB *job, *prev_job;
JCR *mig_jcr; /* newly migrated job */
int count;
return false;
}
if (count == 0) {
- return true;
+ set_migration_next_pool(jcr, &pool);
+ return true; /* no work */
}
Dmsg1(dbglevel, "Back from get_job_to_migrate JobId=%d\n", (int)jcr->JobId);
if (jcr->previous_jr.JobId == 0) {
Dmsg1(dbglevel, "JobId=%d no previous JobId\n", (int)jcr->JobId);
Jmsg(jcr, M_INFO, 0, _("No previous Job found to %s.\n"), jcr->get_ActionName(0));
+ set_migration_next_pool(jcr, &pool);
return true; /* no work */
}
} else {
Jmsg(jcr, M_INFO, 0, _("Previous Job has no data to %s.\n"), jcr->get_ActionName(0));
}
+ set_migration_next_pool(jcr, &pool);
return true; /* no work */
}
mig_jcr->jr.PoolId = jcr->jr.PoolId;
mig_jcr->jr.JobId = mig_jcr->JobId;
+ /* Don't let WatchDog checks Max*Time value on this Job */
+ mig_jcr->no_maxtime = true;
+
Dmsg4(dbglevel, "mig_jcr: Name=%s JobId=%d Type=%c Level=%c\n",
mig_jcr->jr.Name, (int)mig_jcr->jr.JobId,
mig_jcr->jr.JobType, mig_jcr->jr.JobLevel);
+ if (set_migration_next_pool(jcr, &pool)) {
+ /* If pool storage specified, use it for restore */
+ copy_rstorage(mig_jcr, pool->storage, _("Pool resource"));
+ copy_rstorage(jcr, pool->storage, _("Pool resource"));
+
+ mig_jcr->pool = jcr->pool;
+ mig_jcr->jr.PoolId = jcr->jr.PoolId;
+ }
+
+ return true;
+}
+
+
+/*
+ * set_migration_next_pool() called by do_migration_init()
+ * at differents stages.
+ * The idea here is tofactorize the NextPool's search code and
+ * to permit do_migration_init() to return with NextPool set in jcr struct.
+ */
+static bool set_migration_next_pool(JCR *jcr, POOL **retpool)
+{
+ POOL_DBR pr;
+ POOL *pool;
+ char ed1[100];
+
/*
* Get the PoolId used with the original job. Then
* find the pool name from the database record.
*/
memset(&pr, 0, sizeof(pr));
- pr.PoolId = mig_jcr->previous_jr.PoolId;
+ pr.PoolId = jcr->jr.PoolId;
if (!db_get_pool_record(jcr, jcr->db, &pr)) {
Jmsg(jcr, M_FATAL, 0, _("Pool for JobId %s not in database. ERR=%s\n"),
edit_int64(pr.PoolId, ed1), db_strerror(jcr->db));
}
/* Get the pool resource corresponding to the original job */
pool = (POOL *)GetResWithName(R_POOL, pr.Name);
+ *retpool = pool;
if (!pool) {
Jmsg(jcr, M_FATAL, 0, _("Pool resource \"%s\" not found.\n"), pr.Name);
return false;
}
- /* If pool storage specified, use it for restore */
- copy_rstorage(mig_jcr, pool->storage, _("Pool resource"));
- copy_rstorage(jcr, pool->storage, _("Pool resource"));
-
/*
* If the original backup pool has a NextPool, make sure a
* record exists in the database. Note, in this case, we
if (!set_migration_wstorage(jcr, pool)) {
return false;
}
- mig_jcr->pool = jcr->pool = pool->NextPool;
+ jcr->pool = pool->NextPool;
pm_strcpy(jcr->pool_source, _("Job Pool's NextPool resource"));
- mig_jcr->jr.PoolId = jcr->jr.PoolId;
Dmsg2(dbglevel, "Write pool=%s read rpool=%s\n", jcr->pool->name(), jcr->rpool->name());
+
return true;
}
+
/*
* Do a Migration of a previous job
*
((STORE *)jcr->rstorage->first())->name());
return false;
}
- if (!start_storage_daemon_job(jcr, jcr->rstorage, jcr->wstorage)) {
+ if (!start_storage_daemon_job(jcr, jcr->rstorage, jcr->wstorage, /*send_bsr*/true)) {
return false;
}
Dmsg0(150, "Storage daemon connection OK\n");
- if (!send_bootstrap_file(jcr, sd) ||
- !response(jcr, sd, OKbootstrap, "Bootstrap", DISPLAY_ERROR)) {
- return false;
- }
/*
* We re-update the job start record so that the start
set_jcr_job_status(mig_jcr, JS_Running);
/* Pickup Job termination data */
- /* Note, the SD stores in jcr->JobFiles/ReadBytes/JobBytes/Errors */
+ /* Note, the SD stores in jcr->JobFiles/ReadBytes/JobBytes/JobErrors */
wait_for_storage_daemon_termination(jcr);
set_jcr_job_status(jcr, jcr->SDJobStatus);
db_write_batch_file_records(jcr); /* used by bulk batch file insert */
const char *sql_jobids_from_client =
"SELECT DISTINCT Job.JobId,Job.StartTime FROM Job,Pool,Client"
" WHERE Client.Name='%s' AND Pool.Name='%s' AND Job.PoolId=Pool.PoolId"
- " AND Job.ClientId=Client.ClientId AND Job.Type='B'"
- " AND Job.JobStatus = 'T'"
+ " AND Job.ClientId=Client.ClientId AND Job.Type IN ('B','C')"
+ " AND Job.JobStatus IN ('T','W')"
" ORDER by Job.StartTime";
/* Get Volume names in Pool */
const char *sql_jobids_from_vol =
"SELECT DISTINCT Job.JobId,Job.StartTime FROM Media,JobMedia,Job"
" WHERE Media.VolumeName='%s' AND Media.MediaId=JobMedia.MediaId"
- " AND JobMedia.JobId=Job.JobId AND Job.Type='B'"
- " AND Job.JobStatus = 'T' AND Media.Enabled=1"
+ " AND JobMedia.JobId=Job.JobId AND Job.Type IN ('B','C')"
+ " AND Job.JobStatus IN ('T','W') AND Media.Enabled=1"
" ORDER by Job.StartTime";
const char *sql_smallest_vol =
const char *sql_jobids_from_mediaid =
"SELECT DISTINCT Job.JobId,Job.StartTime FROM JobMedia,Job"
" WHERE JobMedia.JobId=Job.JobId AND JobMedia.MediaId IN (%s)"
- " AND Job.Type='B' AND Job.JobStatus = 'T'"
+ " AND Job.Type IN ('B','C') AND Job.JobStatus IN ('T','W')"
" ORDER by Job.StartTime";
/* Get the number of bytes in the pool */
" (SELECT DISTINCT Job.JobId from Pool,Job,Media,JobMedia WHERE"
" Pool.Name='%s' AND Media.PoolId=Pool.PoolId AND"
" VolStatus in ('Full','Used','Error','Append') AND Media.Enabled=1 AND"
- " Job.Type='B' AND Job.JobStatus = 'T' AND"
+ " Job.Type IN ('B','C') AND Job.JobStatus IN ('T','W') AND"
" JobMedia.JobId=Job.JobId AND Job.PoolId=Media.PoolId)";
/* Get the number of bytes in the Jobs */
const char *sql_pool_time =
"SELECT DISTINCT Job.JobId FROM Pool,Job,Media,JobMedia WHERE"
" Pool.Name='%s' AND Media.PoolId=Pool.PoolId AND"
- " VolStatus in ('Full','Used','Error') AND Media.Enabled=1 AND"
- " Job.Type='B' AND Job.JobStatus = 'T' AND"
+ " VolStatus IN ('Full','Used','Error') AND Media.Enabled=1 AND"
+ " Job.Type IN ('B','C') AND Job.JobStatus IN ('T','W') AND"
" JobMedia.JobId=Job.JobId AND Job.PoolId=Media.PoolId"
" AND Job.RealEndTime<='%s'";
const char *sql_jobids_of_pool_uncopied_jobs =
"SELECT DISTINCT Job.JobId,Job.StartTime FROM Job,Pool"
" WHERE Pool.Name = '%s' AND Pool.PoolId = Job.PoolId"
- " AND Job.Type = 'B' AND Job.JobStatus = 'T'"
+ " AND Job.Type = 'B' AND Job.JobStatus IN ('T','W')"
+ " AND Job.jobBytes > 0"
" AND Job.JobId NOT IN"
" (SELECT PriorJobId FROM Job WHERE"
- " Type = 'B' AND Job.JobStatus = 'T'"
+ " Type IN ('B','C') AND Job.JobStatus IN ('T','W')"
" AND PriorJobId != 0)"
" ORDER by Job.StartTime";
switch (jcr->JobStatus) {
case JS_Terminated:
- if (jcr->Errors || jcr->SDErrors) {
+ if (jcr->JobErrors || jcr->SDErrors) {
term_msg = _("%s OK -- with warnings");
} else {
term_msg = _("%s OK");
Jmsg(jcr, msg_type, 0, _("%s %s %s (%s): %s\n"
" Build OS: %s %s %s\n"
" Prev Backup JobId: %s\n"
+" Prev Backup Job: %s\n"
" New Backup JobId: %s\n"
" Current JobId: %s\n"
" Current Job: %s\n"
BACULA, my_name, VERSION, LSMDATE, edt,
HOST_OS, DISTNAME, DISTVER,
edit_uint64(jcr->previous_jr.JobId, ec6),
+ jcr->previous_jr.Job,
mig_jcr ? edit_uint64(mig_jcr->jr.JobId, ec7) : "0",
edit_uint64(jcr->jr.JobId, ec8),
jcr->jr.Job,