*/
/*
- Copyright (C) 2001-2003 Kern Sibbald and John Walker
+ Copyright (C) 2001-2005 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
/* Imported subroutines */
/* Imported variables */
-extern struct s_jl joblevels[];
extern struct s_kw ReplaceOptions[];
/*
* For Restore Jobs
* run <job-name> jobid=nn
*
+ * Returns: 0 on error
+ * JobId if OK
+ *
*/
-int run_cmd(UAContext *ua, char *cmd)
+int run_cmd(UAContext *ua, const char *cmd)
{
JCR *jcr;
char *job_name, *level_name, *jid, *store_name, *pool_name;
- char *where, *fileset_name, *client_name, *bootstrap, *replace;
- char *when;
+ char *where, *fileset_name, *client_name, *bootstrap;
+ const char *replace;
+ char *when, *verify_job_name, *catalog_name;
+ char *since = NULL;
+ bool cloned = false;
int Priority = 0;
- int i, j, found, opt;
+ int i, j, opt, files = 0;
+ bool kw_ok;
JOB *job = NULL;
+ JOB *verify_job = NULL;
STORE *store = NULL;
CLIENT *client = NULL;
FILESET *fileset = NULL;
POOL *pool = NULL;
- static char *kw[] = { /* command line arguments */
- N_("job"),
- N_("jobid"),
- N_("client"),
- N_("fileset"),
- N_("level"),
- N_("storage"),
- N_("pool"),
- N_("where"),
- N_("bootstrap"),
- N_("replace"),
- N_("when"),
- N_("priority"),
- N_("yes"), /* 12 -- if you change this change YES_POS too */
- N_("run"), /* 13 -- if you change this change RUN_POS too */
+ static const char *kw[] = { /* command line arguments */
+ "job", /* Used in a switch() */
+ "jobid", /* 1 */
+ "client", /* 2 */
+ "fd",
+ "fileset", /* 4 */
+ "level", /* 5 */
+ "storage", /* 6 */
+ "sd", /* 7 */
+ "pool", /* 8 */
+ "where", /* 9 */
+ "bootstrap", /* 10 */
+ "replace", /* 11 */
+ "when", /* 12 */
+ "priority", /* 13 */
+ "yes", /* 14 -- if you change this change YES_POS too */
+ "verifyjob", /* 15 */
+ "files", /* 16 number of files to restore */
+ "catalog", /* 17 override catalog */
+ "since", /* 18 since */
+ "cloned", /* 19 cloned */
NULL};
-#define YES_POS 12
-#define RUN_POS 13
+#define YES_POS 14
if (!open_db(ua)) {
return 1;
fileset_name = NULL;
bootstrap = NULL;
replace = NULL;
+ verify_job_name = NULL;
+ catalog_name = NULL;
for (i=1; i<ua->argc; i++) {
- found = False;
- Dmsg2(200, "Doing arg %d = %s\n", i, ua->argk[i]);
- for (j=0; !found && kw[j]; j++) {
+ 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 (!ua->argv[i] && (j != YES_POS /*yes*/ && j != RUN_POS)) {
+ if (!ua->argv[i] && j != YES_POS /*yes*/) {
bsendmsg(ua, _("Value missing for keyword %s\n"), ua->argk[i]);
return 1;
}
- Dmsg1(200, "Got keyword=%s\n", kw[j]);
+ Dmsg1(800, "Got keyword=%s\n", NPRT(kw[j]));
switch (j) {
case 0: /* job */
if (job_name) {
bsendmsg(ua, _("Job name specified twice.\n"));
- return 1;
+ return 0;
}
job_name = ua->argv[i];
- found = True;
+ kw_ok = true;
break;
case 1: /* JobId */
if (jid) {
bsendmsg(ua, _("JobId specified twice.\n"));
- return 1;
+ return 0;
}
jid = ua->argv[i];
- found = True;
+ kw_ok = true;
break;
case 2: /* client */
+ case 3: /* fd */
if (client_name) {
bsendmsg(ua, _("Client specified twice.\n"));
- return 1;
+ return 0;
}
client_name = ua->argv[i];
- found = True;
+ kw_ok = true;
break;
- case 3: /* fileset */
+ case 4: /* fileset */
if (fileset_name) {
bsendmsg(ua, _("FileSet specified twice.\n"));
- return 1;
+ return 0;
}
fileset_name = ua->argv[i];
- found = True;
+ kw_ok = true;
break;
- case 4: /* level */
+ case 5: /* level */
if (level_name) {
bsendmsg(ua, _("Level specified twice.\n"));
- return 1;
+ return 0;
}
level_name = ua->argv[i];
- found = True;
+ kw_ok = true;
break;
- case 5: /* storage */
+ case 6: /* storage */
+ case 7: /* sd */
if (store_name) {
bsendmsg(ua, _("Storage specified twice.\n"));
- return 1;
+ return 0;
}
store_name = ua->argv[i];
- found = True;
+ kw_ok = true;
break;
- case 6: /* pool */
+ case 8: /* pool */
if (pool_name) {
bsendmsg(ua, _("Pool specified twice.\n"));
- return 1;
+ return 0;
}
pool_name = ua->argv[i];
- found = True;
+ kw_ok = true;
break;
- case 7: /* where */
+ case 9: /* where */
if (where) {
bsendmsg(ua, _("Where specified twice.\n"));
- return 1;
+ return 0;
}
where = ua->argv[i];
- found = True;
+ kw_ok = true;
break;
- case 8: /* bootstrap */
+ case 10: /* bootstrap */
if (bootstrap) {
bsendmsg(ua, _("Bootstrap specified twice.\n"));
- return 1;
+ return 0;
}
bootstrap = ua->argv[i];
- found = True;
+ kw_ok = true;
break;
- case 9: /* replace */
+ case 11: /* replace */
if (replace) {
bsendmsg(ua, _("Replace specified twice.\n"));
- return 1;
+ return 0;
}
replace = ua->argv[i];
- found = True;
+ kw_ok = true;
break;
- case 10: /* When */
+ case 12: /* When */
if (when) {
bsendmsg(ua, _("When specified twice.\n"));
- return 1;
+ return 0;
}
when = ua->argv[i];
- found = True;
+ kw_ok = true;
break;
- case 11: /* Priority */
+ case 13: /* Priority */
if (Priority) {
bsendmsg(ua, _("Priority specified twice.\n"));
- return 1;
+ return 0;
}
Priority = atoi(ua->argv[i]);
if (Priority <= 0) {
bsendmsg(ua, _("Priority must be positive nonzero setting it to 10.\n"));
Priority = 10;
}
+ kw_ok = true;
+ break;
+ case 14: /* yes */
+ kw_ok = true;
+ break;
+ case 15: /* Verify Job */
+ if (verify_job_name) {
+ bsendmsg(ua, _("Verify Job specified twice.\n"));
+ return 0;
+ }
+ verify_job_name = ua->argv[i];
+ kw_ok = true;
+ break;
+ case 16: /* files */
+ files = atoi(ua->argv[i]);
+ kw_ok = true;
+ break;
+
+ case 17: /* catalog */
+ catalog_name = ua->argv[i];
+ kw_ok = true;
+ break;
+
+ case 18: /* since */
+ since = ua->argv[i];
+ kw_ok = true;
break;
- case 12: /* yes */
- case 13: /* run */
- found = True;
+
+ case 19: /* cloned */
+ cloned = true;
+ kw_ok = true;
break;
+
default:
break;
}
} /* end strcase compare */
} /* end keyword loop */
- if (!found) {
- Dmsg1(200, "%s not found\n", ua->argk[i]);
+ /*
+ * End of keyword for loop -- if not found, we got a bogus keyword
+ */
+ if (!kw_ok) {
+ Dmsg1(800, "%s not found\n", ua->argk[i]);
/*
* Special case for Job Name, it can be the first
* keyword that has no value.
*/
if (!job_name && !ua->argv[i]) {
job_name = ua->argk[i]; /* use keyword as job name */
- Dmsg1(200, "Set jobname=%s\n", job_name);
+ Dmsg1(800, "Set jobname=%s\n", job_name);
} else {
bsendmsg(ua, _("Invalid keyword: %s\n"), ua->argk[i]);
- return 1;
+ return 0;
}
}
} /* end argc loop */
- Dmsg0(200, "Done scan.\n");
-
-
+ Dmsg0(800, "Done scan.\n");
+
+ CAT *catalog = NULL;
+ if (catalog_name != NULL) {
+ catalog = (CAT *)GetResWithName(R_CATALOG, catalog_name);
+ if (catalog == NULL) {
+ bsendmsg(ua, _("Catalog \"%s\" not found\n"), catalog_name);
+ return 0;
+ }
+ }
+ Dmsg1(800, "Using catalog=%s\n", NPRT(catalog_name));
if (job_name) {
/* Find Job */
job = (JOB *)GetResWithName(R_JOB, job_name);
if (!job) {
- bsendmsg(ua, _("Job \"%s\" not found\n"), job_name);
+ if (*job_name != 0) {
+ bsendmsg(ua, _("Job \"%s\" not found\n"), job_name);
+ }
job = select_job_resource(ua);
} else {
- Dmsg1(200, "Found job=%s\n", job_name);
+ Dmsg1(800, "Found job=%s\n", job_name);
}
} else {
bsendmsg(ua, _("A job name must be specified.\n"));
job = select_job_resource(ua);
}
if (!job) {
- return 1;
+ return 0;
+ } else if (!acl_access_ok(ua, Job_ACL, job->hdr.name)) {
+ bsendmsg(ua, _("No authorization. Job \"%s\".\n"),
+ job->hdr.name);
+ return 0;
}
if (store_name) {
store = (STORE *)GetResWithName(R_STORAGE, store_name);
if (!store) {
- bsendmsg(ua, _("Storage \"%s\" not found.\n"), store_name);
+ if (*store_name != 0) {
+ bsendmsg(ua, _("Storage \"%s\" not found.\n"), store_name);
+ }
store = select_storage_resource(ua);
}
} else {
- store = job->storage; /* use default */
+ store = (STORE *)job->storage->first(); /* use default */
}
if (!store) {
return 1;
+ } else if (!acl_access_ok(ua, Storage_ACL, store->hdr.name)) {
+ bsendmsg(ua, _("No authorization. Storage \"%s\".\n"),
+ store->hdr.name);
+ return 0;
}
-
+ Dmsg1(800, "Using storage=%s\n", store->hdr.name);
if (pool_name) {
pool = (POOL *)GetResWithName(R_POOL, pool_name);
if (!pool) {
- bsendmsg(ua, _("Pool \"%s\" not found.\n"), pool_name);
- pool = get_pool_resource(ua);
+ if (*pool_name != 0) {
+ bsendmsg(ua, _("Pool \"%s\" not found.\n"), pool_name);
+ }
+ pool = select_pool_resource(ua);
}
} else {
pool = job->pool; /* use default */
}
+ if (!pool) {
+ return 0;
+ } else if (!acl_access_ok(ua, Pool_ACL, pool->hdr.name)) {
+ bsendmsg(ua, _("No authorization. Pool \"%s\".\n"),
+ pool->hdr.name);
+ return 0;
+ }
+ Dmsg1(800, "Using pool\n", pool->hdr.name);
if (client_name) {
client = (CLIENT *)GetResWithName(R_CLIENT, client_name);
if (!client) {
- bsendmsg(ua, _("Client \"%s\" not found.\n"), client_name);
+ if (*client_name != 0) {
+ bsendmsg(ua, _("Client \"%s\" not found.\n"), client_name);
+ }
client = select_client_resource(ua);
}
} else {
client = job->client; /* use default */
}
if (!client) {
- return 1;
+ return 0;
+ } else if (!acl_access_ok(ua, Client_ACL, client->hdr.name)) {
+ bsendmsg(ua, _("No authorization. Client \"%s\".\n"),
+ client->hdr.name);
+ return 0;
}
+ Dmsg1(800, "Using client=%s\n", client->hdr.name);
if (fileset_name) {
fileset = (FILESET *)GetResWithName(R_FILESET, fileset_name);
fileset = job->fileset; /* use default */
}
if (!fileset) {
- return 1;
+ return 0;
+ } else if (!acl_access_ok(ua, FileSet_ACL, fileset->hdr.name)) {
+ bsendmsg(ua, _("No authorization. FileSet \"%s\".\n"),
+ fileset->hdr.name);
+ return 0;
}
+ if (verify_job_name) {
+ verify_job = (JOB *)GetResWithName(R_JOB, verify_job_name);
+ if (!verify_job) {
+ bsendmsg(ua, _("Verify Job \"%s\" not found.\n"), verify_job_name);
+ verify_job = select_job_resource(ua);
+ }
+ } else {
+ verify_job = job->verify_job;
+ }
- /* Create JCR to run job */
+ /*
+ * Create JCR to run job. NOTE!!! after this point, free_jcr()
+ * before returning.
+ */
jcr = new_jcr(sizeof(JCR), dird_free_jcr);
set_jcr_defaults(jcr, job);
- jcr->store = store;
+ jcr->verify_job = verify_job;
+ set_storage(jcr, store);
jcr->client = client;
jcr->fileset = fileset;
jcr->pool = pool;
+ jcr->ExpectedFiles = files;
+ if (catalog != NULL) {
+ jcr->catalog = catalog;
+ }
if (where) {
if (jcr->where) {
free(jcr->where);
jcr->sched_time = time(NULL);
}
}
-
+
if (bootstrap) {
if (jcr->RestoreBootstrap) {
free(jcr->RestoreBootstrap);
}
if (!jcr->replace) {
bsendmsg(ua, _("Invalid replace option: %s\n"), replace);
- return 0;
+ goto bail_out;
}
} else if (job->replace) {
jcr->replace = job->replace;
jcr->JobPriority = Priority;
}
+ if (since) {
+ if (!jcr->stime) {
+ jcr->stime = get_pool_memory(PM_MESSAGE);
+ }
+ pm_strcpy(jcr->stime, since);
+ }
+
+ jcr->cloned = cloned;
+
+ if (find_arg(ua, _("fdcalled")) > 0) {
+ jcr->file_bsock = dup_bsock(ua->UA_sock);
+ ua->quit = true;
+ }
+
try_again:
replace = ReplaceOptions[0].name;
for (i=0; ReplaceOptions[i].name; i++) {
replace = ReplaceOptions[i].name;
}
}
- Dmsg1(20, "JobType=%c\n", jcr->JobType);
+ if (level_name) {
+ if (!get_level_from_name(jcr, level_name)) {
+ bsendmsg(ua, _("Level %s not valid.\n"), level_name);
+ goto bail_out;
+ }
+ }
+ if (jid) {
+ jcr->RestoreJobId = str_to_int64(jid);
+ }
+
+ /* Run without prompting? */
+ if (ua->batch || find_arg(ua, _("yes")) > 0) {
+ goto start_job;
+ }
+
+ /*
+ * Prompt User to see if all run job parameters are correct, and
+ * allow him to modify them.
+ */
+ Dmsg1(800, "JobType=%c\n", jcr->JobType);
switch (jcr->JobType) {
char ec1[30];
char dt[MAX_TIME_LENGTH];
- case JT_ADMIN:
- bsendmsg(ua, _("Run %s job\n\
-JobName: %s\n\
-FileSet: %s\n\
-Client: %s\n\
-Storage: %s\n\
-When: %s\n\
-Priority: %d\n"),
+ case JT_ADMIN:
+ bsendmsg(ua, _("Run %s job\n"
+"JobName: %s\n"
+"FileSet: %s\n"
+"Client: %s\n"
+"Storage: %s\n"
+"When: %s\n"
+"Priority: %d\n"),
_("Admin"),
job->hdr.name,
jcr->fileset->hdr.name,
NPRT(jcr->client->hdr.name),
- NPRT(jcr->store->hdr.name),
- bstrutime(dt, sizeof(dt), jcr->sched_time),
+ NPRT(jcr->store->hdr.name),
+ bstrutime(dt, sizeof(dt), jcr->sched_time),
jcr->JobPriority);
- jcr->JobLevel = L_FULL;
- break;
- case JT_BACKUP:
- case JT_VERIFY:
- if (level_name) {
- /* Look up level name and pull code */
- found = 0;
- for (i=0; joblevels[i].level_name; i++) {
- if (strcasecmp(level_name, _(joblevels[i].level_name)) == 0) {
- jcr->JobLevel = joblevels[i].level;
- found = 1;
- break;
- }
- }
- if (!found) {
- bsendmsg(ua, _("Level %s not valid.\n"), level_name);
- free_jcr(jcr);
- return 1;
- }
- }
- level_name = NULL;
- bsendmsg(ua, _("Run %s job\n\
-JobName: %s\n\
-FileSet: %s\n\
-Level: %s\n\
-Client: %s\n\
-Storage: %s\n\
-Pool: %s\n\
-When: %s\n\
-Priority: %d\n"),
- jcr->JobType==JT_BACKUP?_("Backup"):_("Verify"),
+ jcr->JobLevel = L_FULL;
+ break;
+ case JT_BACKUP:
+ case JT_VERIFY:
+ if (jcr->JobType == JT_BACKUP) {
+ bsendmsg(ua, _("Run %s job\n"
+"JobName: %s\n"
+"FileSet: %s\n"
+"Level: %s\n"
+"Client: %s\n"
+"Storage: %s\n"
+"Pool: %s\n"
+"When: %s\n"
+"Priority: %d\n"),
+ _("Backup"),
job->hdr.name,
jcr->fileset->hdr.name,
level_to_str(jcr->JobLevel),
jcr->client->hdr.name,
jcr->store->hdr.name,
- NPRT(jcr->pool->hdr.name),
+ NPRT(jcr->pool->hdr.name),
bstrutime(dt, sizeof(dt), jcr->sched_time),
jcr->JobPriority);
- break;
- case JT_RESTORE:
- if (jcr->RestoreJobId == 0 && !jcr->RestoreBootstrap) {
- if (jid) {
- jcr->RestoreJobId = atoi(jid);
- } else {
- if (!get_pint(ua, _("Please enter a JobId for restore: "))) {
- free_jcr(jcr);
- return 1;
- }
- jcr->RestoreJobId = ua->pint32_val;
- }
+ } else { /* JT_VERIFY */
+ const char *Name;
+ if (jcr->verify_job) {
+ Name = jcr->verify_job->hdr.name;
+ } else {
+ Name = "";
}
- jcr->JobLevel = L_FULL; /* default level */
- Dmsg1(20, "JobId to restore=%d\n", jcr->RestoreJobId);
- if (jcr->RestoreJobId == 0) {
- bsendmsg(ua, _("Run Restore job\n\
-JobName: %s\n\
-Bootstrap: %s\n\
-Where: %s\n\
-Replace: %s\n\
-FileSet: %s\n\
-Client: %s\n\
-Storage: %s\n\
-When: %s\n\
-Priority: %d\n"),
- job->hdr.name,
- NPRT(jcr->RestoreBootstrap),
- jcr->where?jcr->where:NPRT(job->RestoreWhere),
- replace,
- jcr->fileset->hdr.name,
- jcr->client->hdr.name,
- jcr->store->hdr.name,
- bstrutime(dt, sizeof(dt), jcr->sched_time),
- jcr->JobPriority);
+ bsendmsg(ua, _("Run %s job\n"
+"JobName: %s\n"
+"FileSet: %s\n"
+"Level: %s\n"
+"Client: %s\n"
+"Storage: %s\n"
+"Pool: %s\n"
+"Verify Job: %s\n"
+"When: %s\n"
+"Priority: %d\n"),
+ _("Verify"),
+ job->hdr.name,
+ jcr->fileset->hdr.name,
+ level_to_str(jcr->JobLevel),
+ jcr->client->hdr.name,
+ jcr->store->hdr.name,
+ NPRT(jcr->pool->hdr.name),
+ Name,
+ bstrutime(dt, sizeof(dt), jcr->sched_time),
+ jcr->JobPriority);
+ }
+ break;
+ case JT_RESTORE:
+ if (jcr->RestoreJobId == 0 && !jcr->RestoreBootstrap) {
+ if (jid) {
+ jcr->RestoreJobId = str_to_int64(jid);
} else {
- bsendmsg(ua, _("Run Restore job\n\
-JobName: %s\n\
-Bootstrap: %s\n\
-Where: %s\n\
-Replace: %s\n\
-FileSet: %s\n\
-Client: %s\n\
-Storage: %s\n\
-JobId: %s\n\
-When: %s\n\
-Priority: %d\n"),
- job->hdr.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->RestoreJobId==0?"*None*":edit_uint64(jcr->RestoreJobId, ec1),
- bstrutime(dt, sizeof(dt), jcr->sched_time),
- jcr->JobPriority);
+ if (!get_pint(ua, _("Please enter a JobId for restore: "))) {
+ goto bail_out;
+ }
+ jcr->RestoreJobId = ua->int64_val;
}
- break;
- default:
- bsendmsg(ua, _("Unknown Job Type=%d\n"), jcr->JobType);
- free_jcr(jcr);
- return 0;
+ }
+ jcr->JobLevel = L_FULL; /* default level */
+ Dmsg1(800, "JobId to restore=%d\n", jcr->RestoreJobId);
+ if (jcr->RestoreJobId == 0) {
+ bsendmsg(ua, _("Run Restore job\n"
+ "JobName: %s\n"
+ "Bootstrap: %s\n"
+ "Where: %s\n"
+ "Replace: %s\n"
+ "FileSet: %s\n"
+ "Client: %s\n"
+ "Storage: %s\n"
+ "When: %s\n"
+ "Catalog: %s\n"
+ "Priority: %d\n"),
+ job->hdr.name,
+ NPRT(jcr->RestoreBootstrap),
+ jcr->where?jcr->where:NPRT(job->RestoreWhere),
+ replace,
+ jcr->fileset->hdr.name,
+ jcr->client->hdr.name,
+ jcr->store->hdr.name,
+ bstrutime(dt, sizeof(dt), jcr->sched_time),
+ jcr->catalog->hdr.name,
+ jcr->JobPriority);
+ } else {
+ bsendmsg(ua, _("Run Restore job\n"
+ "JobName: %s\n"
+ "Bootstrap: %s\n"
+ "Where: %s\n"
+ "Replace: %s\n"
+ "Client: %s\n"
+ "Storage: %s\n"
+ "JobId: %s\n"
+ "When: %s\n"
+ "Catalog: %s\n"
+ "Priority: %d\n"),
+ job->hdr.name,
+ NPRT(jcr->RestoreBootstrap),
+ jcr->where?jcr->where:NPRT(job->RestoreWhere),
+ replace,
+ jcr->client->hdr.name,
+ jcr->store->hdr.name,
+ jcr->RestoreJobId==0?"*None*":edit_uint64(jcr->RestoreJobId, ec1),
+ bstrutime(dt, sizeof(dt), jcr->sched_time),
+ jcr->catalog->hdr.name,
+ jcr->JobPriority);
+ }
+ break;
+ default:
+ bsendmsg(ua, _("Unknown Job Type=%d\n"), jcr->JobType);
+ goto bail_out;
}
- /* Run without prompting? */
- if (find_arg(ua, _("yes")) > 0) {
- Dmsg1(200, "Calling run_job job=%x\n", jcr->job);
- run_job(jcr);
- bsendmsg(ua, _("Run command submitted.\n"));
- return 1;
- }
if (!get_cmd(ua, _("OK to run? (yes/mod/no): "))) {
- free_jcr(jcr);
- return 0; /* do not run */
+ goto bail_out;
}
/*
* At user request modify parameters of job to be run.
*/
- if (ua->cmd[0] == 0) {
- bsendmsg(ua, _("Job not run.\n"));
- free_jcr(jcr);
- return 0; /* do not run */
- }
- if (strncasecmp(ua->cmd, _("mod"), strlen(ua->cmd)) == 0) {
+ if (ua->cmd[0] != 0 && strncasecmp(ua->cmd, _("mod"), strlen(ua->cmd)) == 0) {
FILE *fd;
start_prompt(ua, _("Parameters to modify:\n"));
if (jcr->JobType == JT_BACKUP ||
jcr->JobType == JT_VERIFY) {
add_prompt(ua, _("Pool")); /* 7 */
+ if (jcr->JobType == JT_VERIFY) {
+ add_prompt(ua, _("Verify Job")); /* 8 */
+ }
} else if (jcr->JobType == JT_RESTORE) {
add_prompt(ua, _("Bootstrap")); /* 7 */
add_prompt(ua, _("Where")); /* 8 */
add_prompt(ua, _("Initialize Catalog"));
add_prompt(ua, _("Verify Catalog"));
add_prompt(ua, _("Verify Volume to Catalog"));
+ add_prompt(ua, _("Verify Disk to Catalog"));
add_prompt(ua, _("Verify Volume Data (not yet implemented)"));
switch (do_prompt(ua, "", _("Select level"), NULL, 0)) {
case 0:
jcr->JobLevel = L_VERIFY_VOLUME_TO_CATALOG;
break;
case 3:
+ jcr->JobLevel = L_VERIFY_DISK_TO_CATALOG;
+ break;
+ case 4:
jcr->JobLevel = L_VERIFY_DATA;
break;
default:
/* Storage */
store = select_storage_resource(ua);
if (store) {
- jcr->store = store;
+ set_storage(jcr, store);
goto try_again;
}
break;
if (fileset) {
jcr->fileset = fileset;
goto try_again;
- }
+ }
break;
case 4:
/* Client */
}
goto try_again;
case 7:
+ /* Pool or Bootstrap depending on JobType */
if (jcr->JobType == JT_BACKUP ||
jcr->JobType == JT_VERIFY) { /* Pool */
pool = select_pool_resource(ua);
}
goto try_again;
case 8:
+ /* Verify Job */
+ if (jcr->JobType == JT_VERIFY) {
+ verify_job = select_job_resource(ua);
+ if (verify_job) {
+ jcr->verify_job = verify_job;
+ }
+ goto try_again;
+ }
/* Where */
if (!get_cmd(ua, _("Please enter path prefix for restore (/ for none): "))) {
break;
bsendmsg(ua, _("You must set the bootstrap file to NULL to be able to specify a JobId.\n"));
}
goto try_again;
- default:
+ default:
goto try_again;
}
- bsendmsg(ua, _("Job not run.\n"));
- free_jcr(jcr);
- return 0; /* error do no run Job */
+ goto bail_out;
}
- if (strncasecmp(ua->cmd, _("yes"), strlen(ua->cmd)) == 0) {
- Dmsg1(200, "Calling run_job job=%x\n", jcr->job);
- run_job(jcr);
- bsendmsg(ua, _("Run command submitted.\n"));
- return 1;
+ if (ua->cmd[0] == 0 || strncasecmp(ua->cmd, _("yes"), strlen(ua->cmd)) == 0) {
+ JobId_t JobId;
+ Dmsg1(800, "Calling run_job job=%x\n", jcr->job);
+start_job:
+ JobId = run_job(jcr);
+ free_jcr(jcr); /* release jcr */
+ if (JobId == 0) {
+ bsendmsg(ua, _("Job failed.\n"));
+ } else {
+ char ed1[50];
+ bsendmsg(ua, _("Job started. JobId=%s\n"), edit_int64(JobId,ed1));
+ }
+ return JobId;
}
+bail_out:
bsendmsg(ua, _("Job not run.\n"));
free_jcr(jcr);
return 0; /* do not run */
-
}
projects / bacula / bacula / blobdiff