* Version $Id$
*/
/*
- Copyright (C) 2001-2005 Kern Sibbald
+ Copyright (C) 2001-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
* run [job=]<job-name> level=<level-name>
*
* For Restore Jobs
- * run <job-name> jobid=nn
+ * run <job-name>
*
* Returns: 0 on error
* JobId if OK
char *where, *fileset_name, *client_name, *bootstrap;
const char *replace;
char *when, *verify_job_name, *catalog_name;
+ char *previous_job_name;
char *since = NULL;
+ char *verify_list;
bool cloned = false;
int Priority = 0;
int i, j, opt, files = 0;
bool kw_ok;
JOB *job = NULL;
JOB *verify_job = NULL;
+ JOB *previous_job = NULL;
STORE *store = NULL;
CLIENT *client = NULL;
FILESET *fileset = NULL;
"catalog", /* 17 override catalog */
"since", /* 18 since */
"cloned", /* 19 cloned */
+ "verifylist", /* 20 verify output list */
+ "migrationjob", /* 21 migration job name */
NULL};
#define YES_POS 14
bootstrap = NULL;
replace = NULL;
verify_job_name = NULL;
+ previous_job_name = NULL;
catalog_name = NULL;
+ verify_list = NULL;
for (i=1; i<ua->argc; i++) {
Dmsg2(800, "Doing arg %d = %s\n", i, ua->argk[i]);
kw_ok = false;
/* Keep looking until we find a good keyword */
for (j=0; !kw_ok && kw[j]; j++) {
- if (strcasecmp(ua->argk[i], _(kw[j])) == 0) {
- /* Note, yes and run have no value, so do not err */
+ if (strcasecmp(ua->argk[i], kw[j]) == 0) {
+ /* Note, yes and run have no value, so do not fail */
if (!ua->argv[i] && j != YES_POS /*yes*/) {
bsendmsg(ua, _("Value missing for keyword %s\n"), ua->argk[i]);
return 1;
kw_ok = true;
break;
+ case 20: /* write verify list output */
+ verify_list = ua->argv[i];
+ kw_ok = true;
+ break;
+ case 21: /* Migration Job */
+ if (previous_job_name) {
+ bsendmsg(ua, _("Migration Job specified twice.\n"));
+ return 0;
+ }
+ previous_job_name = ua->argv[i];
+ kw_ok = true;
+ break;
+
+
default:
break;
}
}
if (!job) {
return 0;
- } else if (!acl_access_ok(ua, Job_ACL, job->hdr.name)) {
+ } else if (!acl_access_ok(ua, Job_ACL, job->name())) {
bsendmsg(ua, _("No authorization. Job \"%s\".\n"),
- job->hdr.name);
+ job->name());
return 0;
}
}
if (!store) {
return 1;
- } else if (!acl_access_ok(ua, Storage_ACL, store->hdr.name)) {
+ } else if (!acl_access_ok(ua, Storage_ACL, store->name())) {
bsendmsg(ua, _("No authorization. Storage \"%s\".\n"),
- store->hdr.name);
+ store->name());
return 0;
}
- Dmsg1(800, "Using storage=%s\n", store->hdr.name);
+ Dmsg1(800, "Using storage=%s\n", store->name());
if (pool_name) {
pool = (POOL *)GetResWithName(R_POOL, pool_name);
}
if (!pool) {
return 0;
- } else if (!acl_access_ok(ua, Pool_ACL, pool->hdr.name)) {
+ } else if (!acl_access_ok(ua, Pool_ACL, pool->name())) {
bsendmsg(ua, _("No authorization. Pool \"%s\".\n"),
- pool->hdr.name);
+ pool->name());
return 0;
}
- Dmsg1(800, "Using pool\n", pool->hdr.name);
+ Dmsg1(800, "Using pool\n", pool->name());
if (client_name) {
client = (CLIENT *)GetResWithName(R_CLIENT, client_name);
}
if (!client) {
return 0;
- } else if (!acl_access_ok(ua, Client_ACL, client->hdr.name)) {
+ } else if (!acl_access_ok(ua, Client_ACL, client->name())) {
bsendmsg(ua, _("No authorization. Client \"%s\".\n"),
- client->hdr.name);
+ client->name());
return 0;
}
- Dmsg1(800, "Using client=%s\n", client->hdr.name);
+ Dmsg1(800, "Using client=%s\n", client->name());
if (fileset_name) {
fileset = (FILESET *)GetResWithName(R_FILESET, fileset_name);
}
if (!fileset) {
return 0;
- } else if (!acl_access_ok(ua, FileSet_ACL, fileset->hdr.name)) {
+ } else if (!acl_access_ok(ua, FileSet_ACL, fileset->name())) {
bsendmsg(ua, _("No authorization. FileSet \"%s\".\n"),
- fileset->hdr.name);
+ fileset->name());
return 0;
}
verify_job = job->verify_job;
}
+ if (previous_job_name) {
+ previous_job = (JOB *)GetResWithName(R_JOB, previous_job_name);
+ if (!previous_job) {
+ bsendmsg(ua, _("Migration Job \"%s\" not found.\n"), previous_job_name);
+ previous_job = select_job_resource(ua);
+ }
+ } else {
+ previous_job = job->verify_job;
+ }
+
+
/*
* Create JCR to run job. NOTE!!! after this point, free_jcr()
* before returning.
set_jcr_defaults(jcr, job);
jcr->verify_job = verify_job;
- set_storage(jcr, store);
+ jcr->previous_job = previous_job;
+ set_rwstorage(jcr, store);
jcr->client = client;
jcr->fileset = fileset;
jcr->pool = pool;
jcr->cloned = cloned;
- if (find_arg(ua, N_("fdcalled")) > 0) {
+ if (find_arg(ua, NT_("fdcalled")) > 0) {
jcr->file_bsock = dup_bsock(ua->UA_sock);
ua->quit = true;
}
}
}
if (jid) {
+ /* Note, this is also MigrateJobId */
jcr->RestoreJobId = str_to_int64(jid);
}
/* Run without prompting? */
- if (ua->batch || find_arg(ua, N_("yes")) > 0) {
+ if (ua->batch || find_arg(ua, NT_("yes")) > 0) {
goto start_job;
}
"When: %s\n"
"Priority: %d\n"),
_("Admin"),
- job->hdr.name,
- jcr->fileset->hdr.name,
- NPRT(jcr->client->hdr.name),
- NPRT(jcr->store->hdr.name),
+ job->name(),
+ jcr->fileset->name(),
+ NPRT(jcr->client->name()),
+ NPRT(jcr->wstore->name()),
bstrutime(dt, sizeof(dt), jcr->sched_time),
jcr->JobPriority);
jcr->JobLevel = L_FULL;
"When: %s\n"
"Priority: %d\n"),
_("Backup"),
- job->hdr.name,
- jcr->fileset->hdr.name,
+ job->name(),
+ jcr->fileset->name(),
level_to_str(jcr->JobLevel),
- jcr->client->hdr.name,
- jcr->store->hdr.name,
- NPRT(jcr->pool->hdr.name),
+ jcr->client->name(),
+ jcr->wstore->name(),
+ NPRT(jcr->pool->name()),
bstrutime(dt, sizeof(dt), jcr->sched_time),
jcr->JobPriority);
} else { /* JT_VERIFY */
const char *Name;
if (jcr->verify_job) {
- Name = jcr->verify_job->hdr.name;
+ Name = jcr->verify_job->name();
} else {
Name = "";
}
+ if (!verify_list) {
+ verify_list = job->WriteVerifyList;
+ }
+ if (!verify_list) {
+ verify_list = "";
+ }
bsendmsg(ua, _("Run %s job\n"
"JobName: %s\n"
"FileSet: %s\n"
"Storage: %s\n"
"Pool: %s\n"
"Verify Job: %s\n"
+"Verify List: %s\n"
"When: %s\n"
"Priority: %d\n"),
_("Verify"),
- job->hdr.name,
- jcr->fileset->hdr.name,
+ job->name(),
+ jcr->fileset->name(),
level_to_str(jcr->JobLevel),
- jcr->client->hdr.name,
- jcr->store->hdr.name,
- NPRT(jcr->pool->hdr.name),
+ jcr->client->name(),
+ jcr->rstore->name(),
+ NPRT(jcr->pool->name()),
Name,
+ verify_list,
bstrutime(dt, sizeof(dt), jcr->sched_time),
jcr->JobPriority);
}
"When: %s\n"
"Catalog: %s\n"
"Priority: %d\n"),
- job->hdr.name,
+ job->name(),
NPRT(jcr->RestoreBootstrap),
jcr->where?jcr->where:NPRT(job->RestoreWhere),
replace,
- jcr->fileset->hdr.name,
- jcr->client->hdr.name,
- jcr->store->hdr.name,
+ jcr->fileset->name(),
+ jcr->client->name(),
+ jcr->rstore->name(),
bstrutime(dt, sizeof(dt), jcr->sched_time),
- jcr->catalog->hdr.name,
+ jcr->catalog->name(),
jcr->JobPriority);
} else {
bsendmsg(ua, _("Run Restore job\n"
"When: %s\n"
"Catalog: %s\n"
"Priority: %d\n"),
- job->hdr.name,
+ job->name(),
NPRT(jcr->RestoreBootstrap),
jcr->where?jcr->where:NPRT(job->RestoreWhere),
replace,
- jcr->client->hdr.name,
- jcr->store->hdr.name,
+ jcr->client->name(),
+ jcr->rstore->name(),
jcr->RestoreJobId==0?"*None*":edit_uint64(jcr->RestoreJobId, ec1),
bstrutime(dt, sizeof(dt), jcr->sched_time),
- jcr->catalog->hdr.name,
+ jcr->catalog->name(),
jcr->JobPriority);
}
break;
+ case JT_MIGRATE:
+ jcr->JobLevel = L_FULL; /* default level */
+ bsendmsg(ua, _("Run Migration job\n"
+ "JobName: %s\n"
+ "Bootstrap: %s\n"
+ "FileSet: %s\n"
+ "Client: %s\n"
+ "Storage: %s\n"
+ "JobId: %s\n"
+ "When: %s\n"
+ "Catalog: %s\n"
+ "Priority: %d\n"),
+ job->name(),
+ NPRT(jcr->RestoreBootstrap),
+ jcr->fileset->name(),
+ jcr->client->name(),
+ jcr->wstore->name(),
+ jcr->MigrateJobId==0?"*None*":edit_uint64(jcr->MigrateJobId, ec1),
+ bstrutime(dt, sizeof(dt), jcr->sched_time),
+ jcr->catalog->name(),
+ jcr->JobPriority);
+ break;
default:
bsendmsg(ua, _("Unknown Job Type=%d\n"), jcr->JobType);
goto bail_out;
}
-
if (!get_cmd(ua, _("OK to run? (yes/mod/no): "))) {
goto bail_out;
}
/* Storage */
store = select_storage_resource(ua);
if (store) {
- set_storage(jcr, store);
+ set_rwstorage(jcr, store);
goto try_again;
}
break;
}
if (ua->cmd[0] != 0) {
jcr->RestoreBootstrap = bstrdup(ua->cmd);
- fd = fopen(jcr->RestoreBootstrap, "r");
+ fd = fopen(jcr->RestoreBootstrap, "rb");
if (!fd) {
bsendmsg(ua, _("Warning cannot open %s: ERR=%s\n"),
jcr->RestoreBootstrap, strerror(errno));
Dmsg1(800, "Calling run_job job=%x\n", jcr->job);
start_job:
JobId = run_job(jcr);
+#if 0
+ bsendmsg(ua, "<job director=\"console\" time=\"%u\" status=\"%c\" type=\"%c\" "
+ "jobid=\"%u\" job=\"%s\" level=\"%c\" finished=\"false\" priority=\"%u\"/>\n",
+ time(NULL), jcr->JobStatus, jcr->JobType, jcr->JobId,
+ jcr->Job, jcr->JobLevel, jcr->JobPriority);
+#endif
free_jcr(jcr); /* release jcr */
if (JobId == 0) {
bsendmsg(ua, _("Job failed.\n"));
projects / bacula / bacula / blobdiff