extern int autodisplaycmd(UAContext *ua, char *cmd);
extern int sqlquerycmd(UAContext *ua, char *cmd);
extern int querycmd(UAContext *ua, char *cmd);
-extern int runcmd(UAContext *ua, char *cmd);
+extern int run_cmd(UAContext *ua, char *cmd);
extern int retentioncmd(UAContext *ua, char *cmd);
extern int prunecmd(UAContext *ua, char *cmd);
extern int purgecmd(UAContext *ua, char *cmd);
static int update_pool(UAContext *ua);
static int delete_volume(UAContext *ua);
static int delete_pool(UAContext *ua);
+static int delete_job(UAContext *ua);
static int mount_cmd(UAContext *ua, char *cmd);
static int release_cmd(UAContext *ua, char *cmd);
static int update_cmd(UAContext *ua, char *cmd);
{ N_("estimate"), estimate_cmd, _("performs FileSet estimate, listing gives full listing")},
{ N_("exit"), quit_cmd, _("exit = quit")},
{ N_("help"), help_cmd, _("print this command")},
+ { N_("list"), list_cmd, _("list [pools | jobs | jobtotals | media <pool> | files jobid=<nn>]; from catalog")},
{ N_("label"), label_cmd, _("label a tape")},
- { N_("list"), list_cmd, _("list [pools | jobs | jobtotals | media <pool> | files job=<nn>]; from catalog")},
{ N_("llist"), llist_cmd, _("full or long list like list command")},
{ N_("messages"), messagescmd, _("messages")},
{ N_("mount"), mount_cmd, _("mount <storage-name>")},
{ N_("prune"), prunecmd, _("prune expired records from catalog")},
{ N_("purge"), purgecmd, _("purge records from catalog")},
- { N_("query"), querycmd, _("query catalog")},
{ N_("quit"), quit_cmd, _("quit")},
+ { N_("query"), querycmd, _("query catalog")},
+ { N_("restore"), restore_cmd, _("restore files")},
{ N_("relabel"), relabel_cmd, _("relabel a tape")},
{ N_("release"), release_cmd, _("release <storage-name>")},
- { N_("restore"), restore_cmd, _("restore files")},
- { N_("run"), runcmd, _("run <job-name>")},
+ { N_("run"), run_cmd, _("run <job-name>")},
+ { N_("status"), status_cmd, _("status [storage | client]=<name>")},
{ N_("setdebug"), setdebug_cmd, _("sets debug level")},
{ N_("show"), show_cmd, _("show (resource records) [jobs | pools | ... | all]")},
{ N_("sqlquery"), sqlquerycmd, _("use SQL to query catalog")},
- { N_("status"), status_cmd, _("status [storage | client]=<name>")},
{ N_("time"), time_cmd, _("print current time")},
{ N_("unmount"), unmount_cmd, _("unmount <storage-name>")},
{ N_("update"), update_cmd, _("update Volume or Pool")},
int first_id = 0;
char name[MAX_NAME_LENGTH];
STORE *store;
- int slot = 0;
+ int Slot = 0, InChanger = 0;
bsendmsg(ua, _(
"You probably don't want to be using this command since it\n"
if (!get_pint(ua, _("Enter slot (0 for none): "))) {
return 1;
}
- slot = ua->pint32_val;
+ Slot = ua->pint32_val;
+ if (!get_yesno(ua, _("InChanger? yes/no: "))) {
+ return 1;
+ }
+ InChanger = ua->pint32_val;
}
set_pool_dbr_defaults_in_media_dbr(&mr, &pr);
for (i=startnum; i < num+startnum; i++) {
bsnprintf(mr.VolumeName, sizeof(mr.VolumeName), name, i);
- mr.Slot = slot++;
+ mr.Slot = Slot++;
+ mr.InChanger = InChanger;
Dmsg1(200, "Create Volume %s\n", mr.VolumeName);
if (!db_create_media_record(ua->jcr, ua->db, &mr)) {
bsendmsg(ua, db_strerror(ua->db));
if (!db_sql_query(ua->db, query, NULL, NULL)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
} else {
- bsendmsg(ua, _("New recycle flag is: %s\n"),
+ bsendmsg(ua, _("New Recycle flag is: %s\n"),
mr->Recycle==1?_("yes"):_("no"));
}
free_pool_memory(query);
}
+/* Modify the Pool in which this Volume is located */
+static void update_volpool(UAContext *ua, char *val, MEDIA_DBR *mr)
+{
+ POOL_DBR pr;
+
+ memset(&pr, 0, sizeof(pr));
+ bstrncpy(pr.Name, val, sizeof(pr.Name));
+ if (!get_pool_dbr(ua, &pr)) {
+ return;
+ }
+ mr->PoolId = pr.PoolId; /* set new PoolId */
+ /*
+ * Make sure to use db_update... rather than doing this directly,
+ * so that any Slot is handled correctly.
+ */
+ if (!db_update_media_record(ua->jcr, ua->db, mr)) {
+ bsendmsg(ua, _("Error updating media record Pool: ERR=%s"), db_strerror(ua->db));
+ } else {
+ bsendmsg(ua, _("New Pool is: %s\n"), pr.Name);
+ }
+}
+
/*
* Update a media record -- allows you to change the
* Volume status. E.g. if you want Bacula to stop
static int update_volume(UAContext *ua)
{
MEDIA_DBR mr;
+ POOL_DBR pr;
POOLMEM *query;
char ed1[30];
bool done = false;
N_("MaxVolFiles"), /* 4 */
N_("MaxVolBytes"), /* 5 */
N_("Recycle"), /* 6 */
+ N_("Pool"), /* 7 */
NULL };
for (int i=0; kw[i]; i++) {
case 6:
update_volrecycle(ua, ua->argv[j], &mr);
break;
+ case 7:
+ update_volpool(ua, ua->argv[j], &mr);
}
done = true;
}
add_prompt(ua, _("Maximum Volume Bytes"));
add_prompt(ua, _("Recycle Flag"));
add_prompt(ua, _("Slot"));
+ add_prompt(ua, _("InChanger Flag"));
add_prompt(ua, _("Volume Files"));
+ add_prompt(ua, _("Pool"));
add_prompt(ua, _("Done"));
switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) {
case 0: /* Volume Status */
break;
case 7: /* Slot */
- int slot;
- POOL_DBR pr;
+ int Slot;
memset(&pr, 0, sizeof(POOL_DBR));
pr.PoolId = mr.PoolId;
if (!get_pint(ua, _("Enter new Slot: "))) {
return 0;
}
- slot = ua->pint32_val;
- if (pr.MaxVols > 0 && slot > (int)pr.MaxVols) {
+ Slot = ua->pint32_val;
+ if (pr.MaxVols > 0 && Slot > (int)pr.MaxVols) {
bsendmsg(ua, _("Invalid slot, it must be between 0 and %d\n"),
pr.MaxVols);
break;
}
- query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "UPDATE Media SET Slot=%d WHERE MediaId=%u",
- slot, mr.MediaId);
- if (!db_sql_query(ua->db, query, NULL, NULL)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ mr.Slot = Slot;
+ /*
+ * Make sure to use db_update... rather than doing this directly,
+ * so that any Slot is handled correctly.
+ */
+ if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
+ bsendmsg(ua, _("Error updating media record Slot: ERR=%s"), db_strerror(ua->db));
} else {
- bsendmsg(ua, "New Slot is: %d\n", slot);
+ bsendmsg(ua, _("New Slot is: %s\n"), mr.Slot);
+ }
+ break;
+
+ case 8: /* InChanger */
+ bsendmsg(ua, _("Current InChanger flag is: %d\n"), mr.InChanger);
+ if (!get_yesno(ua, _("Set InChanger flag? yes/no: "))) {
+ return 0;
+ }
+ mr.InChanger = ua->pint32_val;
+ /*
+ * Make sure to use db_update... rather than doing this directly,
+ * so that any Slot is handled correctly.
+ */
+ if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
+ bsendmsg(ua, _("Error updating media record Slot: ERR=%s"), db_strerror(ua->db));
+ } else {
+ bsendmsg(ua, _("New InChanger flag is: %s\n"), mr.InChanger);
}
- free_pool_memory(query);
break;
- case 8: /* Volume Files */
+
+ case 9: /* Volume Files */
int32_t VolFiles;
bsendmsg(ua, _("Warning changing Volume Files can result\n"
"in loss of data on your Volume\n\n"));
free_pool_memory(query);
break;
+ case 10: /* Volume's Pool */
+ memset(&pr, 0, sizeof(POOL_DBR));
+ pr.PoolId = mr.PoolId;
+ if (!db_get_pool_record(ua->jcr, ua->db, &pr)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ return 0;
+ }
+ bsendmsg(ua, _("Current Pool is: %s\n"), pr.Name);
+ if (!get_cmd(ua, _("Enter new Pool name: "))) {
+ return 0;
+ }
+ update_volpool(ua, ua->cmd, &mr);
+ return 1;
+
default: /* Done or error */
bsendmsg(ua, "Selection done.\n");
return 1;
debug_level = level;
return 1;
}
- if (strcasecmp(ua->argk[i], _("client")) == 0) {
+ if (strcasecmp(ua->argk[i], _("client")) == 0 ||
+ strcasecmp(ua->argk[i], _("fd")) == 0) {
client = NULL;
if (ua->argv[i]) {
client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
}
if (strcasecmp(ua->argk[i], _("store")) == 0 ||
- strcasecmp(ua->argk[i], _("storage")) == 0) {
+ strcasecmp(ua->argk[i], _("storage")) == 0 ||
+ strcasecmp(ua->argk[i], _("sd")) == 0) {
store = NULL;
if (ua->argv[i]) {
store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]);
char since[MAXSTRING];
for (int i=1; i<ua->argc; i++) {
- if (strcasecmp(ua->argk[i], _("client")) == 0) {
+ if (strcasecmp(ua->argk[i], _("client")) == 0 ||
+ strcasecmp(ua->argk[i], _("fd")) == 0) {
if (ua->argv[i]) {
client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
continue;
static char *keywords[] = {
N_("volume"),
N_("pool"),
+ N_("job"),
NULL};
if (!open_db(ua)) {
return 1;
}
- bsendmsg(ua, _(
-"In general it is not a good idea to delete either a\n"
-"Pool or a Volume since they may contain data.\n\n"));
switch (find_arg_keyword(ua, keywords)) {
case 0:
case 1:
delete_pool(ua);
return 1;
+ case 2:
+ delete_job(ua);
+ return 1;
default:
break;
}
+
+ bsendmsg(ua, _(
+"In general it is not a good idea to delete either a\n"
+"Pool or a Volume since they may contain data.\n\n"));
+
switch (do_keyword_prompt(ua, _("Choose catalog item to delete"), keywords)) {
case 0:
delete_volume(ua);
case 1:
delete_pool(ua);
break;
+ case 2:
+ delete_job(ua);
+ return 1;
default:
bsendmsg(ua, _("Nothing done.\n"));
break;
return 1;
}
+static int delete_job(UAContext *ua)
+{
+ POOLMEM *query = get_pool_memory(PM_MESSAGE);
+ JobId_t JobId;
+
+ int i = find_arg_with_value(ua, "jobid");
+ if (i >= 0) {
+ JobId = str_to_int64(ua->argv[i]);
+ } else if (!get_pint(ua, _("Enter JobId to delete: "))) {
+ return 0;
+ } else {
+ JobId = ua->pint32_val;
+ }
+ Mmsg(&query, "DELETE FROM Job WHERE JobId=%u", JobId);
+ db_sql_query(ua->db, query, NULL, (void *)NULL);
+ Mmsg(&query, "DELETE FROM File WHERE JobId=%u", JobId);
+ db_sql_query(ua->db, query, NULL, (void *)NULL);
+ Mmsg(&query, "DELETE FROM JobMedia WHERE JobId=%u", JobId);
+ db_sql_query(ua->db, query, NULL, (void *)NULL);
+ free_pool_memory(query);
+ bsendmsg(ua, _("Job %u and associated records deleted from the catalog.\n"), JobId);
+ return 1;
+}
+
/*
* Delete media records from database -- dangerous
*/
{
unsigned int i;
-/* usage(); */
bsendmsg(ua, _(" Command Description\n ======= ===========\n"));
for (i=0; i<comsize; i++) {
bsendmsg(ua, _(" %-10s %s\n"), _(commands[i].key), _(commands[i].help));
}
- bsendmsg(ua, "\n");
+ bsendmsg(ua, _("\nWhen at a prompt, entering a period cancels the command.\n\n"));
return 1;
}
{
if (ua->db) {
db_close_database(ua->jcr, ua->db);
+ ua->db = NULL;
+ if (ua->jcr) {
+ ua->jcr->db = NULL;
+ }
}
- ua->db = NULL;
}
projects / bacula / bacula / blobdiff