*/
/*
- Copyright (C) 2000-2003 Kern Sibbald and John Walker
+ Copyright (C) 2000-2004 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
extern char my_name[];
extern jobq_t job_queue; /* job queue */
+
extern char *list_pool;
/* Imported functions */
-extern int status_cmd(UAContext *ua, char *cmd);
-extern int list_cmd(UAContext *ua, char *cmd);
-extern int llist_cmd(UAContext *ua, char *cmd);
-extern int show_cmd(UAContext *ua, char *cmd);
-extern int messagescmd(UAContext *ua, char *cmd);
-extern int autodisplaycmd(UAContext *ua, char *cmd);
-extern int sqlquerycmd(UAContext *ua, char *cmd);
-extern int querycmd(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);
-extern int restore_cmd(UAContext *ua, char *cmd);
-extern int label_cmd(UAContext *ua, char *cmd);
-extern int relabel_cmd(UAContext *ua, char *cmd);
+extern int status_cmd(UAContext *ua, const char *cmd);
+extern int list_cmd(UAContext *ua, const char *cmd);
+extern int llist_cmd(UAContext *ua, const char *cmd);
+extern int show_cmd(UAContext *ua, const char *cmd);
+extern int messagescmd(UAContext *ua, const char *cmd);
+extern int autodisplay_cmd(UAContext *ua, const char *cmd);
+extern int gui_cmd(UAContext *ua, const char *cmd);
+extern int sqlquerycmd(UAContext *ua, const char *cmd);
+extern int querycmd(UAContext *ua, const char *cmd);
+extern int run_cmd(UAContext *ua, const char *cmd);
+extern int retentioncmd(UAContext *ua, const char *cmd);
+extern int prunecmd(UAContext *ua, const char *cmd);
+extern int purgecmd(UAContext *ua, const char *cmd);
+extern int restore_cmd(UAContext *ua, const char *cmd);
+extern int label_cmd(UAContext *ua, const char *cmd);
+extern int relabel_cmd(UAContext *ua, const char *cmd);
extern int update_slots(UAContext *ua); /* ua_label.c */
/* Forward referenced functions */
-static int add_cmd(UAContext *ua, char *cmd);
-static int create_cmd(UAContext *ua, char *cmd);
-static int cancel_cmd(UAContext *ua, char *cmd);
-static int setdebug_cmd(UAContext *ua, char *cmd);
-static int var_cmd(UAContext *ua, char *cmd);
-static int estimate_cmd(UAContext *ua, char *cmd);
-static int help_cmd(UAContext *ua, char *cmd);
-static int delete_cmd(UAContext *ua, char *cmd);
-static int use_cmd(UAContext *ua, char *cmd), unmount_cmd(UAContext *ua, char *cmd);
-static int version_cmd(UAContext *ua, char *cmd), automount_cmd(UAContext *ua, char *cmd);
-static int time_cmd(UAContext *ua, char *cmd);
+static int add_cmd(UAContext *ua, const char *cmd);
+static int create_cmd(UAContext *ua, const char *cmd);
+static int cancel_cmd(UAContext *ua, const char *cmd);
+static int setdebug_cmd(UAContext *ua, const char *cmd);
+static int trace_cmd(UAContext *ua, const char *cmd);
+static int var_cmd(UAContext *ua, const char *cmd);
+static int estimate_cmd(UAContext *ua, const char *cmd);
+static int help_cmd(UAContext *ua, const char *cmd);
+static int delete_cmd(UAContext *ua, const char *cmd);
+static int use_cmd(UAContext *ua, const char *cmd);
+static int unmount_cmd(UAContext *ua, const char *cmd);
+static int version_cmd(UAContext *ua, const char *cmd);
+static int automount_cmd(UAContext *ua, const char *cmd);
+static int time_cmd(UAContext *ua, const char *cmd);
+static int reload_cmd(UAContext *ua, const char *cmd);
static int update_volume(UAContext *ua);
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);
-static int wait_cmd(UAContext *ua, char *cmd);
+static int mount_cmd(UAContext *ua, const char *cmd);
+static int release_cmd(UAContext *ua, const char *cmd);
+static int update_cmd(UAContext *ua, const char *cmd);
+static int wait_cmd(UAContext *ua, const char *cmd);
+static int setip_cmd(UAContext *ua, const char *cmd);
-int quit_cmd(UAContext *ua, char *cmd);
+int qhelp_cmd(UAContext *ua, const char *cmd);
+int quit_cmd(UAContext *ua, const char *cmd);
-struct cmdstruct { char *key; int (*func)(UAContext *ua, char *cmd); char *help; };
+struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; };
static struct cmdstruct commands[] = {
{ N_("add"), add_cmd, _("add media to a pool")},
- { N_("autodisplay"), autodisplaycmd, _("autodisplay [on/off] -- console messages")},
+ { N_("autodisplay"), autodisplay_cmd, _("autodisplay [on/off] -- console messages")},
{ N_("automount"), automount_cmd, _("automount [on/off] -- after label")},
{ N_("cancel"), cancel_cmd, _("cancel job=nnn -- cancel a job")},
{ N_("create"), create_cmd, _("create DB Pool from resource")},
{ N_("delete"), delete_cmd, _("delete [pool=<pool-name> | media volume=<volume-name>]")},
{ N_("estimate"), estimate_cmd, _("performs FileSet estimate, listing gives full listing")},
{ N_("exit"), quit_cmd, _("exit = quit")},
+ { N_("gui"), gui_cmd, _("gui [on/off] -- non-interactive gui mode")},
{ 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_("restore"), restore_cmd, _("restore files")},
{ N_("relabel"), relabel_cmd, _("relabel a tape")},
{ N_("release"), release_cmd, _("release <storage-name>")},
+ { N_("reload"), reload_cmd, _("reload conf file")},
{ N_("run"), run_cmd, _("run <job-name>")},
{ N_("status"), status_cmd, _("status [storage | client]=<name>")},
{ N_("setdebug"), setdebug_cmd, _("sets debug level")},
+ { N_("setip"), setip_cmd, _("sets new client address -- if authorized")},
{ N_("show"), show_cmd, _("show (resource records) [jobs | pools | ... | all]")},
{ N_("sqlquery"), sqlquerycmd, _("use SQL to query catalog")},
{ N_("time"), time_cmd, _("print current time")},
+ { N_("trace"), trace_cmd, _("turn on/off trace to file")},
{ N_("unmount"), unmount_cmd, _("unmount <storage-name>")},
{ N_("update"), update_cmd, _("update Volume or Pool")},
{ N_("use"), use_cmd, _("use catalog xxx")},
/*
* Execute a command from the UA
*/
-int do_a_command(UAContext *ua, char *cmd)
+int do_a_command(UAContext *ua, const char *cmd)
{
unsigned int i;
int len, stat;
- int found;
+ bool found = false;
- found = 0;
stat = 1;
- Dmsg1(120, "Command: %s\n", ua->UA_sock->msg);
+ Dmsg1(200, "Command: %s\n", ua->UA_sock->msg);
if (ua->argc == 0) {
return 1;
}
len = strlen(ua->argk[0]);
for (i=0; i<comsize; i++) { /* search for command */
if (strncasecmp(ua->argk[0], _(commands[i].key), len) == 0) {
+ if (!acl_access_ok(ua, Command_ACL, ua->argk[0], len)) {
+ break;
+ }
stat = (*commands[i].func)(ua, cmd); /* go execute command */
- found = 1;
+ found = true;
break;
}
}
if (!found) {
- pm_strcat(&ua->UA_sock->msg, _(": is an illegal command\n"));
- ua->UA_sock->msglen = strlen(ua->UA_sock->msg);
- bnet_send(ua->UA_sock);
+ bnet_fsend(ua->UA_sock, _("%s: is an illegal command.\n"), ua->argk[0]);
}
return stat;
}
/*
* Add Volumes to an existing Pool
*/
-static int add_cmd(UAContext *ua, char *cmd)
+static int add_cmd(UAContext *ua, const char *cmd)
{
POOL_DBR pr;
MEDIA_DBR mr;
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));
+ bsendmsg(ua, "%s", db_strerror(ua->db));
return 1;
}
if (i == startnum) {
pr.NumVols += num;
Dmsg0(200, "Update pool record.\n");
if (db_update_pool_record(ua->jcr, ua->db, &pr) != 1) {
- bsendmsg(ua, db_strerror(ua->db));
+ bsendmsg(ua, "%s", db_strerror(ua->db));
return 1;
}
bsendmsg(ua, _("%d Volumes created in pool %s\n"), num, pr.Name);
* automount on
* automount off
*/
-int automount_cmd(UAContext *ua, char *cmd)
+int automount_cmd(UAContext *ua, const char *cmd)
{
char *onoff;
/*
* Cancel a job
*/
-static int cancel_cmd(UAContext *ua, char *cmd)
+static int cancel_cmd(UAContext *ua, const char *cmd)
{
int i, ret;
int njobs = 0;
for (i=1; i<ua->argc; i++) {
if (strcasecmp(ua->argk[i], _("jobid")) == 0) {
+ uint32_t JobId;
if (!ua->argv[i]) {
break;
}
- if (!(jcr=get_jcr_by_id(atoi(ua->argv[i])))) {
- bsendmsg(ua, _("JobId %d is not running.\n"), atoi(ua->argv[i]));
+ JobId = str_to_int64(ua->argv[i]);
+ if (!(jcr=get_jcr_by_id(JobId))) {
+ bsendmsg(ua, _("JobId %d is not running.\n"), JobId);
return 1;
}
break;
if (!jcr) {
/* Count Jobs running */
lock_jcr_chain();
- for (jcr=NULL; (jcr=get_next_jcr(jcr)); njobs++) {
+ foreach_jcr(jcr) {
if (jcr->JobId == 0) { /* this is us */
free_locked_jcr(jcr);
- njobs--;
continue;
}
free_locked_jcr(jcr);
+ njobs++;
}
unlock_jcr_chain();
}
start_prompt(ua, _("Select Job:\n"));
lock_jcr_chain();
- for (jcr=NULL; (jcr=get_next_jcr(jcr)); ) {
+ foreach_jcr(jcr) {
if (jcr->JobId == 0) { /* this is us */
free_locked_jcr(jcr);
continue;
* Create a Pool Record in the database.
* It is always created from the Resource record.
*/
-static int create_cmd(UAContext *ua, char *cmd)
+static int create_cmd(UAContext *ua, const char *cmd)
{
POOL *pool;
switch (create_pool(ua->jcr, ua->db, pool, POOL_OP_CREATE)) {
case 0:
- bsendmsg(ua, _("Error: Pool %s already exists.\n\
-Use update to change it.\n"), pool->hdr.name);
+ bsendmsg(ua, _("Error: Pool %s already exists.\n"
+ "Use update to change it.\n"), pool->hdr.name);
break;
case -1:
- bsendmsg(ua, db_strerror(ua->db));
+ bsendmsg(ua, "%s", db_strerror(ua->db));
break;
default:
}
+/*
+ * Set a new address in a Client resource. We do this only
+ * if the Console name is the same as the Client name
+ * and the Console can access the client.
+ */
+static int setip_cmd(UAContext *ua, const char *cmd)
+{
+ CLIENT *client;
+ char buf[1024];
+ if (!ua->cons || !acl_access_ok(ua, Client_ACL, ua->cons->hdr.name)) {
+ bsendmsg(ua, _("Illegal command from this console.\n"));
+ return 1;
+ }
+ LockRes();
+ client = (CLIENT *)GetResWithName(R_CLIENT, ua->cons->hdr.name);
+
+ if (!client) {
+ bsendmsg(ua, _("Client \"%s\" not found.\n"), ua->cons->hdr.name);
+ goto get_out;
+ }
+ if (client->address) {
+ free(client->address);
+ }
+ /* MA Bug 6 remove ifdef */
+ sockaddr_to_ascii(&(ua->UA_sock->client_addr), buf, sizeof(buf));
+ client->address = bstrdup(buf);
+ bsendmsg(ua, _("Client \"%s\" address set to %s\n"),
+ client->hdr.name, client->address);
+get_out:
+ UnlockRes();
+ return 1;
+}
/*
* updates pool from Pool resource
* update media pool=<pool-name> volume=<volume-name>
* changes pool info for volume
+ * update slots [scan=...]
+ * updates autochanger slots
*/
-static int update_cmd(UAContext *ua, char *cmd)
+static int update_cmd(UAContext *ua, const char *cmd)
{
- static char *kw[] = {
+ static const char *kw[] = {
N_("media"), /* 0 */
N_("volume"), /* 1 */
N_("pool"), /* 2 */
return 1;
}
-static void update_volstatus(UAContext *ua, char *val, MEDIA_DBR *mr)
+static void update_volstatus(UAContext *ua, const char *val, MEDIA_DBR *mr)
{
POOLMEM *query = get_pool_memory(PM_MESSAGE);
- char *kw[] = {
+ const char *kw[] = {
"Append",
"Archive",
"Disabled",
bsendmsg(ua, _("Invalid VolStatus specified: %s\n"), val);
} else {
bstrncpy(mr->VolStatus, kw[i], sizeof(mr->VolStatus));
- Mmsg(&query, "UPDATE Media SET VolStatus='%s' WHERE MediaId=%u",
+ Mmsg(query, "UPDATE Media SET VolStatus='%s' WHERE MediaId=%u",
mr->VolStatus, mr->MediaId);
if (!db_sql_query(ua->db, query, NULL, NULL)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
static void update_volretention(UAContext *ua, char *val, MEDIA_DBR *mr)
{
- char ed1[50];
+ char ed1[150];
POOLMEM *query;
if (!duration_to_utime(val, &mr->VolRetention)) {
bsendmsg(ua, _("Invalid retention period specified: %s\n"), val);
return;
}
query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "UPDATE Media SET VolRetention=%s WHERE MediaId=%u",
+ Mmsg(query, "UPDATE Media SET VolRetention=%s WHERE MediaId=%u",
edit_uint64(mr->VolRetention, ed1), mr->MediaId);
if (!db_sql_query(ua->db, query, NULL, NULL)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
} else {
- bsendmsg(ua, _("New retention seconds is: %s\n"),
- edit_utime(mr->VolRetention, ed1));
+ bsendmsg(ua, _("New retention period is: %s\n"),
+ edit_utime(mr->VolRetention, ed1, sizeof(ed1)));
}
free_pool_memory(query);
}
static void update_voluseduration(UAContext *ua, char *val, MEDIA_DBR *mr)
{
- char ed1[50];
+ char ed1[150];
POOLMEM *query;
if (!duration_to_utime(val, &mr->VolUseDuration)) {
return;
}
query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "UPDATE Media SET VolUseDuration=%s WHERE MediaId=%u",
+ Mmsg(query, "UPDATE Media SET VolUseDuration=%s WHERE MediaId=%u",
edit_uint64(mr->VolUseDuration, ed1), mr->MediaId);
if (!db_sql_query(ua->db, query, NULL, NULL)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
} else {
bsendmsg(ua, _("New use duration is: %s\n"),
- edit_utime(mr->VolUseDuration, ed1));
+ edit_utime(mr->VolUseDuration, ed1, sizeof(ed1)));
}
free_pool_memory(query);
}
static void update_volmaxjobs(UAContext *ua, char *val, MEDIA_DBR *mr)
{
POOLMEM *query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "UPDATE Media SET MaxVolJobs=%s WHERE MediaId=%u",
+ Mmsg(query, "UPDATE Media SET MaxVolJobs=%s WHERE MediaId=%u",
val, mr->MediaId);
if (!db_sql_query(ua->db, query, NULL, NULL)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
static void update_volmaxfiles(UAContext *ua, char *val, MEDIA_DBR *mr)
{
POOLMEM *query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "UPDATE Media SET MaxVolFiles=%s WHERE MediaId=%u",
+ Mmsg(query, "UPDATE Media SET MaxVolFiles=%s WHERE MediaId=%u",
val, mr->MediaId);
if (!db_sql_query(ua->db, query, NULL, NULL)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
return;
}
query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "UPDATE Media SET MaxVolBytes=%s WHERE MediaId=%u",
+ Mmsg(query, "UPDATE Media SET MaxVolBytes=%s WHERE MediaId=%u",
edit_uint64(maxbytes, ed1), mr->MediaId);
if (!db_sql_query(ua->db, query, NULL, NULL)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
return;
}
query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "UPDATE Media SET Recycle=%d WHERE MediaId=%u",
+ Mmsg(query, "UPDATE Media SET Recycle=%d WHERE MediaId=%u",
recycle, mr->MediaId);
if (!db_sql_query(ua->db, query, NULL, NULL)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
}
/* Modify the Pool in which this Volume is located */
-static void update_volpool(UAContext *ua, char *val, MEDIA_DBR *mr)
+static void update_vol_pool(UAContext *ua, char *val, MEDIA_DBR *mr, POOL_DBR *opr)
{
POOL_DBR pr;
+ POOLMEM *query;
memset(&pr, 0, sizeof(pr));
bstrncpy(pr.Name, val, sizeof(pr.Name));
}
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 {
+ query = get_pool_memory(PM_MESSAGE);
+ db_lock(ua->db);
+ Mmsg(query, "UPDATE Media SET PoolId=%d WHERE MediaId=%u",
+ mr->PoolId, mr->MediaId);
+ if (!db_sql_query(ua->db, query, NULL, NULL)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ } else {
bsendmsg(ua, _("New Pool is: %s\n"), pr.Name);
+ opr->NumVols--;
+ if (!db_update_pool_record(ua->jcr, ua->db, opr)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ }
+ pr.NumVols++;
+ if (!db_update_pool_record(ua->jcr, ua->db, &pr)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ }
+ db_make_inchanger_unique(ua->jcr, ua->db, mr);
}
+ db_unlock(ua->db);
+ free_pool_memory(query);
}
+/*
+ * Refresh the Volume information from the Pool record
+ */
+static void update_volfrompool(UAContext *ua, MEDIA_DBR *mr)
+{
+ POOL_DBR pr;
+
+ memset(&pr, 0, sizeof(pr));
+ pr.PoolId = mr->PoolId;
+ if (!get_pool_dbr(ua, &pr)) {
+ return;
+ }
+ set_pool_dbr_defaults_in_media_dbr(mr, &pr);
+ if (!db_update_media_defaults(ua->jcr, ua->db, mr)) {
+ bsendmsg(ua, _("Error updating Volume record: ERR=%s"), db_strerror(ua->db));
+ } else {
+ bsendmsg(ua, _("Volume defaults updated from Pool record.\n"));
+ }
+}
+
+/*
+ * Refresh the Volume information from the Pool record
+ * for all Volumes
+ */
+static void update_all_vols_from_pool(UAContext *ua)
+{
+ POOL_DBR pr;
+ MEDIA_DBR mr;
+
+ memset(&pr, 0, sizeof(pr));
+ if (!get_pool_dbr(ua, &pr)) {
+ return;
+ }
+ memset(&mr, 0, sizeof(mr));
+ set_pool_dbr_defaults_in_media_dbr(&mr, &pr);
+ mr.PoolId = pr.PoolId;
+ if (!db_update_media_defaults(ua->jcr, ua->db, &mr)) {
+ bsendmsg(ua, _("Error updating Volume records: ERR=%s"), db_strerror(ua->db));
+ } else {
+ bsendmsg(ua, _("All Volume defaults updated from Pool record.\n"));
+ }
+}
+
+
/*
* Update a media record -- allows you to change the
* Volume status. E.g. if you want Bacula to stop
MEDIA_DBR mr;
POOL_DBR pr;
POOLMEM *query;
- char ed1[30];
+ char ed1[130];
bool done = false;
- char *kw[] = {
+ const char *kw[] = {
N_("VolStatus"), /* 0 */
N_("VolRetention"), /* 1 */
N_("VolUse"), /* 2 */
N_("MaxVolBytes"), /* 5 */
N_("Recycle"), /* 6 */
N_("Pool"), /* 7 */
+ N_("FromPool"), /* 8 */
+ N_("AllFromPool"), /* 9 */
NULL };
for (int i=0; kw[i]; i++) {
int j;
+ POOL_DBR pr;
if ((j=find_arg_with_value(ua, kw[i])) > 0) {
- if (!select_media_dbr(ua, &mr)) {
+ if (i != 9 && !select_media_dbr(ua, &mr)) {
return 0;
}
switch (i) {
update_volrecycle(ua, ua->argv[j], &mr);
break;
case 7:
- update_volpool(ua, ua->argv[j], &mr);
+ 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));
+ break;
+ }
+ update_vol_pool(ua, ua->argv[j], &mr, &pr);
+ break;
+ case 8:
+ update_volfrompool(ua, &mr);
+ break;
+ case 9:
+ update_all_vols_from_pool(ua);
}
done = true;
}
add_prompt(ua, _("InChanger Flag"));
add_prompt(ua, _("Volume Files"));
add_prompt(ua, _("Pool"));
+ add_prompt(ua, _("Volume from Pool"));
+ add_prompt(ua, _("All Volumes from Pool"));
add_prompt(ua, _("Done"));
switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) {
case 0: /* Volume Status */
update_volstatus(ua, ua->cmd, &mr);
break;
case 1: /* Retention */
- bsendmsg(ua, _("Current retention seconds is: %s\n"),
- edit_utime(mr.VolRetention, ed1));
+ bsendmsg(ua, _("Current retention period is: %s\n"),
+ edit_utime(mr.VolRetention, ed1, sizeof(ed1)));
if (!get_cmd(ua, _("Enter Volume Retention period: "))) {
return 0;
}
case 2: /* Use Duration */
bsendmsg(ua, _("Current use duration is: %s\n"),
- edit_utime(mr.VolUseDuration, ed1));
+ edit_utime(mr.VolUseDuration, ed1, sizeof(ed1)));
if (!get_cmd(ua, _("Enter Volume Use Duration: "))) {
return 0;
}
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: %s\n"), mr.Slot);
+ bsendmsg(ua, _("New Slot is: %d\n"), mr.Slot);
}
break;
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);
+ bsendmsg(ua, _("New InChanger flag is: %d\n"), mr.InChanger);
}
break;
}
}
query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "UPDATE Media SET VolFiles=%u WHERE MediaId=%u",
+ Mmsg(query, "UPDATE Media SET VolFiles=%u WHERE MediaId=%u",
VolFiles, mr.MediaId);
if (!db_sql_query(ua->db, query, NULL, NULL)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
if (!get_cmd(ua, _("Enter new Pool name: "))) {
return 0;
}
- update_volpool(ua, ua->cmd, &mr);
+ update_vol_pool(ua, ua->cmd, &mr, &pr);
return 1;
+ case 11:
+ update_volfrompool(ua, &mr);
+ break;
+ case 12:
+ update_all_vols_from_pool(ua);
+ break;
default: /* Done or error */
bsendmsg(ua, "Selection done.\n");
return 1;
id, db_strerror(ua->db));
}
query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, list_pool, pr.PoolId);
+ Mmsg(query, list_pool, pr.PoolId);
db_list_sql_query(ua->jcr, ua->db, query, prtit, ua, 1, HORZ_LIST);
free_pool_memory(query);
bsendmsg(ua, _("Pool DB record updated from resource.\n"));
}
-static void do_storage_setdebug(UAContext *ua, STORE *store, int level)
+static void do_storage_setdebug(UAContext *ua, STORE *store, int level, int trace_flag)
{
BSOCK *sd;
}
Dmsg0(120, _("Connected to storage daemon\n"));
sd = ua->jcr->store_bsock;
- bnet_fsend(sd, "setdebug=%d\n", level);
+ bnet_fsend(sd, "setdebug=%d trace=%d\n", level, trace_flag);
if (bnet_recv(sd) >= 0) {
bsendmsg(ua, "%s", sd->msg);
}
return;
}
-static void do_client_setdebug(UAContext *ua, CLIENT *client, int level)
+static void do_client_setdebug(UAContext *ua, CLIENT *client, int level, int trace_flag)
{
BSOCK *fd;
}
Dmsg0(120, "Connected to file daemon\n");
fd = ua->jcr->file_bsock;
- bnet_fsend(fd, "setdebug=%d\n", level);
+ bnet_fsend(fd, "setdebug=%d trace=%d\n", level, trace_flag);
if (bnet_recv(fd) >= 0) {
bsendmsg(ua, "%s", fd->msg);
}
}
-static void do_all_setdebug(UAContext *ua, int level)
+static void do_all_setdebug(UAContext *ua, int level, int trace_flag)
{
STORE *store, **unique_store;
CLIENT *client, **unique_client;
/* Call each unique Storage daemon */
for (j=0; j<i; j++) {
- do_storage_setdebug(ua, unique_store[j], level);
+ do_storage_setdebug(ua, unique_store[j], level, trace_flag);
}
free(unique_store);
/* Call each unique File daemon */
for (j=0; j<i; j++) {
- do_client_setdebug(ua, unique_client[j], level);
+ do_client_setdebug(ua, unique_client[j], level, trace_flag);
}
free(unique_client);
}
/*
- * setdebug level=nn all
+ * setdebug level=nn all trace=1/0
*/
-static int setdebug_cmd(UAContext *ua, char *cmd)
+static int setdebug_cmd(UAContext *ua, const char *cmd)
{
STORE *store;
CLIENT *client;
int level;
+ int trace_flag = -1;
int i;
if (!open_db(ua)) {
level = ua->pint32_val;
}
+ /* Look for trace flag. -1 => not change */
+ i = find_arg_with_value(ua, _("trace"));
+ if (i >= 0) {
+ trace_flag = atoi(ua->argv[i]);
+ if (trace_flag > 0) {
+ trace_flag = 1;
+ }
+ }
+
/* General debug? */
for (i=1; i<ua->argc; i++) {
if (strcasecmp(ua->argk[i], _("all")) == 0) {
- do_all_setdebug(ua, level);
+ do_all_setdebug(ua, level, trace_flag);
return 1;
}
if (strcasecmp(ua->argk[i], _("dir")) == 0 ||
strcasecmp(ua->argk[i], _("director")) == 0) {
debug_level = level;
+ set_trace(trace_flag);
return 1;
}
if (strcasecmp(ua->argk[i], _("client")) == 0 ||
if (ua->argv[i]) {
client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
if (client) {
- do_client_setdebug(ua, client, level);
+ do_client_setdebug(ua, client, level, trace_flag);
return 1;
}
}
client = select_client_resource(ua);
if (client) {
- do_client_setdebug(ua, client, level);
+ do_client_setdebug(ua, client, level, trace_flag);
return 1;
}
}
if (ua->argv[i]) {
store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]);
if (store) {
- do_storage_setdebug(ua, store, level);
+ do_storage_setdebug(ua, store, level, trace_flag);
return 1;
}
}
store = get_storage_resource(ua, 0);
if (store) {
- do_storage_setdebug(ua, store, level);
+ do_storage_setdebug(ua, store, level, trace_flag);
return 1;
}
}
switch(do_prompt(ua, "", _("Select daemon type to set debug level"), NULL, 0)) {
case 0: /* Director */
debug_level = level;
+ set_trace(trace_flag);
break;
case 1:
store = get_storage_resource(ua, 0);
if (store) {
- do_storage_setdebug(ua, store, level);
+ do_storage_setdebug(ua, store, level, trace_flag);
}
break;
case 2:
client = select_client_resource(ua);
if (client) {
- do_client_setdebug(ua, client, level);
+ do_client_setdebug(ua, client, level, trace_flag);
}
break;
case 3:
- do_all_setdebug(ua, level);
+ do_all_setdebug(ua, level, trace_flag);
break;
default:
break;
return 1;
}
-static int var_cmd(UAContext *ua, char *cmd)
+/*
+ * Turn debug tracing to file on/off
+ */
+static int trace_cmd(UAContext *ua, const char *cmd)
+{
+ char *onoff;
+
+ if (ua->argc != 2) {
+ if (!get_cmd(ua, _("Turn on or off? "))) {
+ return 1;
+ }
+ onoff = ua->cmd;
+ } else {
+ onoff = ua->argk[1];
+ }
+
+ set_trace((strcasecmp(onoff, _("off")) == 0) ? false : true);
+ return 1;
+
+}
+
+static int var_cmd(UAContext *ua, const char *cmd)
{
POOLMEM *val = get_pool_memory(PM_FNAME);
char *var;
return 1;
}
-static int estimate_cmd(UAContext *ua, char *cmd)
+static int estimate_cmd(UAContext *ua, const char *cmd)
{
JOB *job = NULL;
CLIENT *client = NULL;
FILESET *fileset = NULL;
+ FILESET_DBR fsr;
int listing = 0;
- BSOCK *fd;
char since[MAXSTRING];
+ JCR *jcr = ua->jcr;
+ jcr->JobLevel = L_FULL;
for (int i=1; i<ua->argc; i++) {
if (strcasecmp(ua->argk[i], _("client")) == 0 ||
strcasecmp(ua->argk[i], _("fd")) == 0) {
}
if (strcasecmp(ua->argk[i], _("listing")) == 0) {
listing = 1;
+ continue;
+ }
+ if (strcasecmp(ua->argk[i], _("level")) == 0) {
+ if (!get_level_from_name(ua->jcr, ua->argv[i])) {
+ bsendmsg(ua, _("Level %s not valid.\n"), ua->argv[i]);
+ }
+ continue;
}
}
if (!job && !(client && fileset)) {
}
if (!job) {
job = (JOB *)GetResWithName(R_JOB, ua->argk[1]);
+ if (!job) {
+ bsendmsg(ua, _("No job specified.\n"));
+ return 1;
+ }
}
if (!client) {
client = job->client;
if (!fileset) {
fileset = job->fileset;
}
- ua->jcr->client = client;
- ua->jcr->fileset = fileset;
+ jcr->client = client;
+ jcr->fileset = fileset;
close_db(ua);
ua->catalog = client->catalog;
return 1;
}
+ jcr->job = job;
+ jcr->JobType = JT_BACKUP;
+ init_jcr_job_record(jcr);
+
+ if (!get_or_create_client_record(jcr)) {
+ return 1;
+ }
+ if (!get_or_create_fileset_record(jcr, &fsr)) {
+ return 1;
+ }
+
get_level_since_time(ua->jcr, since, sizeof(since));
bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"),
job->client->hdr.name, job->client->address, job->client->FDport);
- if (!connect_to_file_daemon(ua->jcr, 1, 15, 0)) {
+ if (!connect_to_file_daemon(jcr, 1, 15, 0)) {
bsendmsg(ua, _("Failed to connect to Client.\n"));
return 1;
}
- fd = ua->jcr->file_bsock;
- if (!send_include_list(ua->jcr)) {
+ if (!send_include_list(jcr)) {
bsendmsg(ua, _("Error sending include list.\n"));
- return 1;
+ goto bail_out;
}
- if (!send_exclude_list(ua->jcr)) {
+ if (!send_exclude_list(jcr)) {
bsendmsg(ua, _("Error sending exclude list.\n"));
- return 1;
+ goto bail_out;
}
- if (!send_level_command(ua->jcr)) {
- return 1;
+ if (!send_level_command(jcr)) {
+ goto bail_out;
}
- bnet_fsend(fd, "estimate listing=%d\n", listing);
- while (bnet_recv(fd) >= 0) {
- bsendmsg(ua, "%s", fd->msg);
+ bnet_fsend(jcr->file_bsock, "estimate listing=%d\n", listing);
+ while (bnet_recv(jcr->file_bsock) >= 0) {
+ bsendmsg(ua, "%s", jcr->file_bsock->msg);
}
- bnet_sig(fd, BNET_TERMINATE);
- bnet_close(fd);
- ua->jcr->file_bsock = NULL;
-
+bail_out:
+ if (jcr->file_bsock) {
+ bnet_sig(jcr->file_bsock, BNET_TERMINATE);
+ bnet_close(jcr->file_bsock);
+ jcr->file_bsock = NULL;
+ }
return 1;
}
/*
* print time
*/
-static int time_cmd(UAContext *ua, char *cmd)
+static int time_cmd(UAContext *ua, const char *cmd)
{
char sdt[50];
time_t ttime = time(NULL);
return 1;
}
+/*
+ * reload the conf file
+ */
+extern "C" void reload_config(int sig);
+
+static int reload_cmd(UAContext *ua, const char *cmd)
+{
+ reload_config(1);
+ return 1;
+}
+
/*
* Delete Pool records (should purge Media with it).
*
* delete pool=<pool-name>
- * delete media pool=<pool-name> volume=<name>
+ * delete volume pool=<pool-name> volume=<name>
+ * delete job jobid=xxx
*/
-static int delete_cmd(UAContext *ua, char *cmd)
+static int delete_cmd(UAContext *ua, const char *cmd)
{
- static char *keywords[] = {
+ static const char *keywords[] = {
N_("volume"),
N_("pool"),
N_("job"),
+ N_("jobid"),
NULL};
if (!open_db(ua)) {
return 1;
}
-
- switch (find_arg_keyword(ua, keywords)) {
+ switch (find_arg_keyword(ua, keywords)) {
case 0:
delete_volume(ua);
return 1;
delete_pool(ua);
return 1;
case 2:
- delete_job(ua);
+ case 3:
+ int i;
+ while ((i=find_arg(ua, _("jobid"))) > 0) {
+ delete_job(ua);
+ *ua->argk[i] = 0; /* zap keyword already visited */
+ }
return 1;
default:
break;
POOLMEM *query = get_pool_memory(PM_MESSAGE);
JobId_t JobId;
- int i = find_arg_with_value(ua, "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: "))) {
} else {
JobId = ua->pint32_val;
}
- Mmsg(&query, "DELETE FROM Job WHERE JobId=%u", JobId);
+ 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);
+ 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);
+ 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);
}
-static void do_mount_cmd(UAContext *ua, char *command)
+static void do_mount_cmd(UAContext *ua, const char *command)
{
STORE *store;
BSOCK *sd;
/*
* mount [storage | device] <name>
*/
-static int mount_cmd(UAContext *ua, char *cmd)
+static int mount_cmd(UAContext *ua, const char *cmd)
{
do_mount_cmd(ua, "mount"); /* mount */
return 1;
/*
* unmount [storage | device] <name>
*/
-static int unmount_cmd(UAContext *ua, char *cmd)
+static int unmount_cmd(UAContext *ua, const char *cmd)
{
do_mount_cmd(ua, "unmount"); /* unmount */
return 1;
/*
* release [storage | device] <name>
*/
-static int release_cmd(UAContext *ua, char *cmd)
+static int release_cmd(UAContext *ua, const char *cmd)
{
do_mount_cmd(ua, "release"); /* release */
return 1;
* Switch databases
* use catalog=<name>
*/
-static int use_cmd(UAContext *ua, char *cmd)
+static int use_cmd(UAContext *ua, const char *cmd)
{
CAT *oldcatalog, *catalog;
return 1;
}
-int quit_cmd(UAContext *ua, char *cmd)
+int quit_cmd(UAContext *ua, const char *cmd)
{
ua->quit = TRUE;
return 1;
/*
* Wait until no job is running
*/
-int wait_cmd(UAContext *ua, char *cmd)
+int wait_cmd(UAContext *ua, const char *cmd)
{
+ JCR *jcr;
bmicrosleep(0, 200000); /* let job actually start */
- for (int running=1; running; ) {
- running = 0;
+ for (bool running=true; running; ) {
+ running = false;
lock_jcr_chain();
- for (JCR *jcr=NULL; (jcr=get_next_jcr(jcr)); ) {
+ foreach_jcr(jcr) {
if (jcr->JobId != 0) {
- running = 1;
+ running = true;
free_locked_jcr(jcr);
break;
}
}
-static int help_cmd(UAContext *ua, char *cmd)
+static int help_cmd(UAContext *ua, const char *cmd)
{
unsigned int i;
return 1;
}
-static int version_cmd(UAContext *ua, char *cmd)
+int qhelp_cmd(UAContext *ua, const char *cmd)
+{
+ unsigned int i;
+
+ for (i=0; i<comsize; i++) {
+ bsendmsg(ua, _("%s %s\n"), _(commands[i].key), _(commands[i].help));
+ }
+ return 1;
+}
+
+static int version_cmd(UAContext *ua, const char *cmd)
{
bsendmsg(ua, "%s Version: " VERSION " (" BDATE ")\n", my_name);
return 1;