#include "bacula.h"
#include "dird.h"
-#include "ua.h"
/* Imported subroutines */
extern void run_job(JCR *jcr);
int runcmd(UAContext *ua, char *cmd)
{
JCR *jcr;
- char *job_name, *level_name, *jid, *store_name;
+ char *job_name, *level_name, *jid, *store_name, *pool_name;
char *where, *fileset_name, *client_name, *bootstrap, *replace;
+ char *when;
+ int Priority = 0;
int i, j, found, opt;
JOB *job = NULL;
STORE *store = NULL;
CLIENT *client = NULL;
FILESET *fileset = NULL;
- static char *kw[] = {
+ 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 -- see below */
NULL};
if (!open_db(ua)) {
level_name = NULL;
jid = NULL;
store_name = NULL;
+ pool_name = NULL;
where = NULL;
+ when = NULL;
client_name = NULL;
fileset_name = NULL;
bootstrap = NULL;
Dmsg2(200, "Doing arg %d = %s\n", i, ua->argk[i]);
for (j=0; !found && kw[j]; j++) {
if (strcasecmp(ua->argk[i], _(kw[j])) == 0) {
- if (!ua->argv[i]) {
+ /* Note, yes has no value, so do not err */
+ if (!ua->argv[i] && j != 11 /*yes*/) {
bsendmsg(ua, _("Value missing for keyword %s\n"), ua->argk[i]);
return 1;
}
store_name = ua->argv[i];
found = True;
break;
- case 6: /* where */
+ case 6: /* pool */
+ if (pool_name) {
+ bsendmsg(ua, _("Pool specified twice.\n"));
+ return 1;
+ }
+ pool_name = ua->argv[i];
+ found = True;
+ break;
+ case 7: /* where */
if (where) {
bsendmsg(ua, _("Where specified twice.\n"));
return 1;
where = ua->argv[i];
found = True;
break;
- case 7: /* bootstrap */
+ case 8: /* bootstrap */
if (bootstrap) {
bsendmsg(ua, _("Bootstrap specified twice.\n"));
return 1;
bootstrap = ua->argv[i];
found = True;
break;
- case 8: /* replace */
+ case 9: /* replace */
if (replace) {
bsendmsg(ua, _("Replace specified twice.\n"));
return 1;
replace = ua->argv[i];
found = True;
break;
+ case 10: /* When */
+ if (when) {
+ bsendmsg(ua, _("When specified twice.\n"));
+ return 1;
+ }
+ when = ua->argv[i];
+ found = True;
+ break;
+ case 11: /* Priority */
+ if (Priority) {
+ bsendmsg(ua, _("Priority specified twice.\n"));
+ return 1;
+ }
+ Priority = atoi(ua->argv[i]);
+ if (Priority <= 0) {
+ bsendmsg(ua, _("Priority must be positive nonzero setting it to 10.\n"));
+ Priority = 10;
+ }
+ break;
+ case 12: /* yes */
+ found = True;
+ break;
default:
break;
}
return 1;
}
+
+ 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);
+ }
+ } else {
+ pool = job->pool; /* use default */
+ }
+
if (client_name) {
client = (CLIENT *)GetResWithName(R_CLIENT, client_name);
if (!client) {
jcr->store = store;
jcr->client = client;
jcr->fileset = fileset;
+ jcr->pool = pool;
if (where) {
- if (jcr->RestoreWhere) {
- free(jcr->RestoreWhere);
+ if (jcr->where) {
+ free(jcr->where);
}
- jcr->RestoreWhere = bstrdup(where);
+ jcr->where = bstrdup(where);
}
+
+ if (when) {
+ jcr->sched_time = str_to_utime(when);
+ if (jcr->sched_time == 0) {
+ bsendmsg(ua, _("Invalid time, using current time.\n"));
+ jcr->sched_time = time(NULL);
+ }
+ }
+
if (bootstrap) {
if (jcr->RestoreBootstrap) {
free(jcr->RestoreBootstrap);
jcr->replace = REPLACE_ALWAYS;
}
+ if (Priority) {
+ jcr->JobPriority = Priority;
+ }
+
try_again:
replace = ReplaceOptions[0].name;
for (i=0; ReplaceOptions[i].name; i++) {
Dmsg1(20, "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"),
+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));
- break;
+ 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:
FileSet: %s\n\
Level: %s\n\
Client: %s\n\
-Storage: %s\n"),
+Storage: %s\n\
+Pool: %s\n\
+When: %s\n\
+Priority: %d\n"),
jcr->JobType==JT_BACKUP?_("Backup"):_("Verify"),
job->hdr.name,
jcr->fileset->hdr.name,
level_to_str(jcr->JobLevel),
jcr->client->hdr.name,
- jcr->store->hdr.name);
+ jcr->store->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_cmd(ua, _("Please enter a JobId for restore: "))) {
+ if (!get_pint(ua, _("Please enter a JobId for restore: "))) {
free_jcr(jcr);
return 1;
}
- jcr->RestoreJobId = atoi(ua->cmd);
+ jcr->RestoreJobId = ua->pint32_val;
}
}
- jcr->JobLevel = 'F'; /* default level */
+ jcr->JobLevel = L_FULL; /* default level */
Dmsg1(20, "JobId to restore=%d\n", jcr->RestoreJobId);
- bsendmsg(ua, _("Run Restore job\n\
+ if (jcr->RestoreJobId == 0) {
+ bsendmsg(ua, _("Run Restore job\n\
JobName: %s\n\
Bootstrap: %s\n\
Where: %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->RestoreWhere?jcr->RestoreWhere:NPRT(job->RestoreWhere),
+ 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);
+ } 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);
+ }
break;
default:
bsendmsg(ua, _("Unknown Job Type=%d\n"), jcr->JobType);
free_jcr(jcr);
return 0;
}
+
+ /* 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 */
/*
* At user request modify parameters of job to be run.
*/
- if (strlen(ua->cmd) == 0) {
+ if (ua->cmd[0] == 0) {
bsendmsg(ua, _("Job not run.\n"));
free_jcr(jcr);
return 0; /* do not run */
add_prompt(ua, _("Job")); /* 2 */
add_prompt(ua, _("FileSet")); /* 3 */
add_prompt(ua, _("Client")); /* 4 */
- if (jcr->JobType == JT_RESTORE) {
- add_prompt(ua, _("Bootstrap")); /* 5 */
- add_prompt(ua, _("Where")); /* 6 */
- add_prompt(ua, _("Replace")); /* 7 */
- add_prompt(ua, _("JobId")); /* 8 */
+ add_prompt(ua, _("When")); /* 5 */
+ add_prompt(ua, _("Priority")); /* 6 */
+ if (jcr->JobType == JT_BACKUP ||
+ jcr->JobType == JT_VERIFY) {
+ add_prompt(ua, _("Pool")); /* 7 */
+ } else if (jcr->JobType == JT_RESTORE) {
+ add_prompt(ua, _("Bootstrap")); /* 7 */
+ add_prompt(ua, _("Where")); /* 8 */
+ add_prompt(ua, _("Replace")); /* 9 */
+ add_prompt(ua, _("JobId")); /* 10 */
}
- switch (do_prompt(ua, _("Select parameter to modify"), NULL, 0)) {
+ switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) {
case 0:
/* Level */
if (jcr->JobType == JT_BACKUP) {
start_prompt(ua, _("Levels:\n"));
+ add_prompt(ua, _("Base"));
add_prompt(ua, _("Full"));
add_prompt(ua, _("Incremental"));
add_prompt(ua, _("Differential"));
add_prompt(ua, _("Since"));
- switch (do_prompt(ua, _("Select level"), NULL, 0)) {
+ switch (do_prompt(ua, "", _("Select level"), NULL, 0)) {
case 0:
- jcr->JobLevel = L_FULL;
+ jcr->JobLevel = L_BASE;
break;
case 1:
- jcr->JobLevel = L_INCREMENTAL;
+ jcr->JobLevel = L_FULL;
break;
case 2:
- jcr->JobLevel = L_DIFFERENTIAL;
+ jcr->JobLevel = L_INCREMENTAL;
break;
case 3:
+ jcr->JobLevel = L_DIFFERENTIAL;
+ break;
+ case 4:
jcr->JobLevel = L_SINCE;
break;
default:
start_prompt(ua, _("Levels:\n"));
add_prompt(ua, _("Initialize Catalog"));
add_prompt(ua, _("Verify Catalog"));
- add_prompt(ua, _("Verify Volume"));
- add_prompt(ua, _("Verify Volume Data"));
- switch (do_prompt(ua, _("Select level"), NULL, 0)) {
+ add_prompt(ua, _("Verify Volume 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_INIT;
break;
}
goto try_again;
case 1:
+ /* Storage */
store = select_storage_resource(ua);
if (store) {
jcr->store = store;
}
break;
case 4:
+ /* Client */
client = select_client_resource(ua);
if (client) {
jcr->client = client;
}
break;
case 5:
+ /* When */
+ if (!get_cmd(ua, _("Please enter desired start time as YYYY-MM-DD HH:MM:SS (return for now): "))) {
+ break;
+ }
+ if (ua->cmd[0] == 0) {
+ jcr->sched_time = time(NULL);
+ } else {
+ jcr->sched_time = str_to_utime(ua->cmd);
+ if (jcr->sched_time == 0) {
+ bsendmsg(ua, _("Invalid time, using current time.\n"));
+ jcr->sched_time = time(NULL);
+ }
+ }
+ goto try_again;
+ case 6:
+ /* Priority */
+ if (!get_pint(ua, _("Enter new Priority: "))) {
+ break;
+ }
+ if (ua->pint32_val == 0) {
+ bsendmsg(ua, _("Priority must be a positive integer.\n"));
+ } else {
+ jcr->JobPriority = ua->pint32_val;
+ }
+ goto try_again;
+ case 7:
+ if (jcr->JobType == JT_BACKUP ||
+ jcr->JobType == JT_VERIFY) { /* Pool */
+ pool = select_pool_resource(ua);
+ if (pool) {
+ jcr->pool = pool;
+ goto try_again;
+ }
+ break;
+ }
+
/* Bootstrap */
if (!get_cmd(ua, _("Please enter the Bootstrap file name: "))) {
break;
}
}
goto try_again;
- case 6:
+ case 8:
/* Where */
if (!get_cmd(ua, _("Please enter path prefix for restore (/ for none): "))) {
break;
}
- if (jcr->RestoreWhere) {
- free(jcr->RestoreWhere);
- jcr->RestoreWhere = NULL;
+ if (jcr->where) {
+ free(jcr->where);
+ jcr->where = NULL;
}
if (ua->cmd[0] == '/' && ua->cmd[1] == 0) {
ua->cmd[0] = 0;
}
- jcr->RestoreWhere = bstrdup(ua->cmd);
+ jcr->where = bstrdup(ua->cmd);
goto try_again;
- case 7:
+ case 9:
/* Replace */
start_prompt(ua, _("Replace:\n"));
for (i=0; ReplaceOptions[i].name; i++) {
add_prompt(ua, ReplaceOptions[i].name);
}
- opt = do_prompt(ua, _("Select replace option"), NULL, 0);
+ opt = do_prompt(ua, "", _("Select replace option"), NULL, 0);
if (opt >= 0) {
jcr->replace = ReplaceOptions[opt].token;
}
goto try_again;
- case 8:
+ case 10:
/* JobId */
jid = NULL; /* force reprompt */
jcr->RestoreJobId = 0;
free_jcr(jcr);
return 0; /* error do no run Job */
}
+
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;
}
projects / bacula / bacula / blobdiff