*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 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
#include "bacula.h"
#include "dird.h"
-#include "ua.h"
/* Imported subroutines */
extern void run_job(JCR *jcr);
extern int r_last;
extern struct s_res resources[];
extern char my_name[];
+#ifndef USE_SEMAPHORE
+extern workq_t job_wq; /* work queue */
+#endif
+
+extern char *list_pool;
/* Imported functions */
extern int statuscmd(UAContext *ua, char *cmd);
extern int listcmd(UAContext *ua, char *cmd);
+extern int llistcmd(UAContext *ua, char *cmd);
extern int showcmd(UAContext *ua, char *cmd);
extern int messagescmd(UAContext *ua, char *cmd);
extern int autodisplaycmd(UAContext *ua, char *cmd);
extern int prunecmd(UAContext *ua, char *cmd);
extern int purgecmd(UAContext *ua, char *cmd);
extern int restorecmd(UAContext *ua, char *cmd);
+extern int labelcmd(UAContext *ua, char *cmd);
+extern int relabelcmd(UAContext *ua, char *cmd);
+extern int update_slots(UAContext *ua); /* ua_label.c */
/* Forward referenced functions */
static int addcmd(UAContext *ua, char *cmd), createcmd(UAContext *ua, char *cmd), cancelcmd(UAContext *ua, char *cmd);
static int helpcmd(UAContext *ua, char *cmd);
static int deletecmd(UAContext *ua, char *cmd);
static int usecmd(UAContext *ua, char *cmd), unmountcmd(UAContext *ua, char *cmd);
-static int labelcmd(UAContext *ua, char *cmd), mountcmd(UAContext *ua, char *cmd), updatecmd(UAContext *ua, char *cmd);
static int versioncmd(UAContext *ua, char *cmd), automountcmd(UAContext *ua, char *cmd);
+static int timecmd(UAContext *ua, 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 mountcmd(UAContext *ua, char *cmd);
+static int updatecmd(UAContext *ua, char *cmd);
+static int waitcmd(UAContext *ua, char *cmd);
int quitcmd(UAContext *ua, char *cmd);
{ N_("delete"), deletecmd, _("delete [pool=<pool-name> | media volume=<volume-name>]")},
{ N_("help"), helpcmd, _("print this command")},
{ N_("label"), labelcmd, _("label a tape")},
+ { N_("relabel"), relabelcmd, _("relabel a tape")},
{ N_("list"), listcmd, _("list [pools | jobs | jobtotals | media <pool> | files job=<nn>]; from catalog")},
+ { N_("llist"), llistcmd, _("full or long list like list command")},
{ N_("messages"), messagescmd, _("messages")},
{ N_("mount"), mountcmd, _("mount <storage-name>")},
{ N_("restore"), restorecmd, _("restore files")},
{ N_("version"), versioncmd, _("print Director version")},
{ N_("quit"), quitcmd, _("quit")},
{ N_("query"), querycmd, _("query catalog")},
+ { N_("time"), timecmd, _("print current time")},
{ N_("exit"), quitcmd, _("exit = quit")},
+ { N_("wait"), waitcmd, _("wait until no jobs are running")},
};
#define comsize (sizeof(commands)/sizeof(struct cmdstruct))
}
len = strlen(ua->argk[0]);
- for (i=0; i<comsize; i++) /* search for command */
+ for (i=0; i<comsize; i++) { /* search for command */
if (strncasecmp(ua->argk[0], _(commands[i].key), len) == 0) {
stat = (*commands[i].func)(ua, cmd); /* go execute command */
found = 1;
break;
}
+ }
if (!found) {
- strcat(ua->UA_sock->msg, _(": is an illegal command\n"));
+ 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);
}
return stat;
}
+/*
+ * This is a common routine used to stuff the Pool DB record defaults
+ * into the Media DB record just before creating a media (Volume)
+ * record.
+ */
+void set_pool_dbr_defaults_in_media_dbr(MEDIA_DBR *mr, POOL_DBR *pr)
+{
+ mr->PoolId = pr->PoolId;
+ strcpy(mr->VolStatus, "Append");
+ mr->Recycle = pr->Recycle;
+ mr->VolRetention = pr->VolRetention;
+ mr->VolUseDuration = pr->VolUseDuration;
+ mr->MaxVolJobs = pr->MaxVolJobs;
+ mr->MaxVolFiles = pr->MaxVolFiles;
+ mr->MaxVolBytes = pr->MaxVolBytes;
+}
+
/*
* Add Volumes to an existing Pool
- *
*/
static int addcmd(UAContext *ua, char *cmd)
{
while (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) {
bsendmsg(ua, _("Pool already has maximum volumes = %d\n"), pr.MaxVols);
for (;;) {
- if (!get_cmd(ua, _("Enter new maximum (zero for unlimited): "))) {
+ if (!get_pint(ua, _("Enter new maximum (zero for unlimited): "))) {
return 1;
}
- pr.MaxVols = atoi(ua->cmd);
- if (pr.MaxVols < 0) {
- bsendmsg(ua, _("Max vols must be zero or greater.\n"));
- continue;
- }
- break;
+ pr.MaxVols = ua->pint32_val;
}
}
/* Get media type */
- if ((store = get_storage_resource(ua, cmd)) != NULL) {
+ if ((store = get_storage_resource(ua, 0)) != NULL) {
strcpy(mr.MediaType, store->media_type);
- } else {
- if (!get_media_type(ua, mr.MediaType)) {
- return 1;
- }
+ } else if (!get_media_type(ua, mr.MediaType, sizeof(mr.MediaType))) {
+ return 1;
}
if (pr.MaxVols == 0) {
for (;;) {
char buf[100];
sprintf(buf, _("Enter number of Volumes to create. 0=>fixed name. Max=%d: "), max);
- if (!get_cmd(ua, buf)) {
+ if (!get_pint(ua, buf)) {
return 1;
}
- num = atoi(ua->cmd);
+ num = ua->pint32_val;
if (num < 0 || num > max) {
bsendmsg(ua, _("The number must be between 0 and %d\n"), max);
continue;
strcat(name, "%04d");
for (;;) {
- if (!get_cmd(ua, _("Enter the starting number: "))) {
+ if (!get_pint(ua, _("Enter the starting number: "))) {
return 1;
}
- startnum = atoi(ua->cmd);
+ startnum = ua->pint32_val;
if (startnum < 1) {
bsendmsg(ua, _("Start number must be greater than zero.\n"));
continue;
}
if (store && store->autochanger) {
- if (!get_cmd(ua, _("Enter slot (0 for none): "))) {
+ if (!get_pint(ua, _("Enter slot (0 for none): "))) {
return 1;
}
- slot = atoi(ua->cmd);
+ slot = ua->pint32_val;
}
- mr.PoolId = pr.PoolId;
- strcpy(mr.VolStatus, "Append");
- mr.Recycle = pr.Recycle;
- mr.VolRetention = pr.VolRetention;
+ set_pool_dbr_defaults_in_media_dbr(&mr, &pr);
for (i=startnum; i < num+startnum; i++) {
sprintf(mr.VolumeName, name, i);
mr.Slot = slot++;
Dmsg1(200, "Create Volume %s\n", mr.VolumeName);
- if (!db_create_media_record(ua->db, &mr)) {
+ if (!db_create_media_record(ua->jcr, ua->db, &mr)) {
bsendmsg(ua, db_strerror(ua->db));
return 1;
}
}
pr.NumVols += num;
Dmsg0(200, "Update pool record.\n");
- if (db_update_pool_record(ua->db, &pr) != 1) {
+ if (db_update_pool_record(ua->jcr, ua->db, &pr) != 1) {
bsendmsg(ua, db_strerror(ua->db));
return 1;
}
}
unlock_jcr_chain();
- if (do_prompt(ua, _("Choose Job to cancel"), JobName) < 0) {
+ if (do_prompt(ua, _("Choose Job to cancel"), JobName, sizeof(JobName)) < 0) {
return 1;
}
if (njobs == 1) {
- if (!get_cmd(ua, _("Confirm cancel (yes/no): "))) {
- return 1;
- }
- if (strcasecmp(ua->cmd, _("yes")) != 0) {
+ if (!get_yesno(ua, _("Confirm cancel (yes/no): ")) || ua->pint32_val == 0) {
return 1;
}
}
switch (jcr->JobStatus) {
case JS_Created:
- jcr->JobStatus = JS_Cancelled;
- bsendmsg(ua, _("JobId %d, Job %s marked to be cancelled.\n"),
+ case JS_WaitJobRes:
+ case JS_WaitClientRes:
+ case JS_WaitStoreRes:
+ case JS_WaitMaxJobs:
+ case JS_WaitStartTime:
+ set_jcr_job_status(jcr, JS_Canceled);
+ bsendmsg(ua, _("JobId %d, Job %s marked to be canceled.\n"),
jcr->JobId, jcr->Job);
+#ifndef USE_SEMAPHORE
+ workq_remove(&job_wq, jcr->work_item); /* attempt to remove it from queue */
+#endif
free_jcr(jcr);
return 1;
default:
+ set_jcr_job_status(jcr, JS_Canceled);
- jcr->JobStatus = JS_Cancelled;
/* Cancel File daemon */
- ua->jcr->client = jcr->client;
- if (!connect_to_file_daemon(ua->jcr, 10, FDConnectTimeout, 1)) {
- bsendmsg(ua, _("Failed to connect to File daemon.\n"));
- free_jcr(jcr);
- return 1;
- }
- Dmsg0(200, "Connected to file daemon\n");
- fd = ua->jcr->file_bsock;
- bnet_fsend(fd, "cancel Job=%s\n", jcr->Job);
- while (bnet_recv(fd) >= 0) {
- bsendmsg(ua, "%s", fd->msg);
+ if (jcr->file_bsock) {
+ ua->jcr->client = jcr->client;
+ if (!connect_to_file_daemon(ua->jcr, 10, FDConnectTimeout, 1)) {
+ bsendmsg(ua, _("Failed to connect to File daemon.\n"));
+ free_jcr(jcr);
+ return 1;
+ }
+ Dmsg0(200, "Connected to file daemon\n");
+ fd = ua->jcr->file_bsock;
+ bnet_fsend(fd, "cancel Job=%s\n", jcr->Job);
+ while (bnet_recv(fd) >= 0) {
+ bsendmsg(ua, "%s", fd->msg);
+ }
+ bnet_sig(fd, BNET_TERMINATE);
+ bnet_close(fd);
+ ua->jcr->file_bsock = NULL;
}
- bnet_sig(fd, BNET_TERMINATE);
- bnet_close(fd);
- ua->jcr->file_bsock = NULL;
/* Cancel Storage daemon */
- ua->jcr->store = jcr->store;
- if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
- bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
- free_jcr(jcr);
- return 1;
- }
- Dmsg0(200, "Connected to storage daemon\n");
- sd = ua->jcr->store_bsock;
- bnet_fsend(sd, "cancel Job=%s\n", jcr->Job);
- while (bnet_recv(sd) >= 0) {
- bsendmsg(ua, "%s", sd->msg);
+ if (jcr->store_bsock) {
+ ua->jcr->store = jcr->store;
+ if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
+ bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
+ free_jcr(jcr);
+ return 1;
+ }
+ Dmsg0(200, "Connected to storage daemon\n");
+ sd = ua->jcr->store_bsock;
+ bnet_fsend(sd, "cancel Job=%s\n", jcr->Job);
+ while (bnet_recv(sd) >= 0) {
+ bsendmsg(ua, "%s", sd->msg);
+ }
+ bnet_sig(sd, BNET_TERMINATE);
+ bnet_close(sd);
+ ua->jcr->store_bsock = NULL;
}
- bnet_sig(sd, BNET_TERMINATE);
- bnet_close(sd);
- ua->jcr->store_bsock = NULL;
-
}
free_jcr(jcr);
return 1;
}
+/*
+ * This is a common routine to create or update a
+ * Pool DB base record from a Pool Resource. We handle
+ * the setting of MaxVols and NumVols slightly differently
+ * depending on if we are creating the Pool or we are
+ * simply bringing it into agreement with the resource (updage).
+ */
+void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, int create)
+{
+ strcpy(pr->PoolType, pool->pool_type);
+ if (create) {
+ pr->MaxVols = pool->max_volumes;
+ pr->NumVols = 0;
+ } else { /* update pool */
+ if (pr->MaxVols != pool->max_volumes) {
+ pr->MaxVols = pool->max_volumes;
+ }
+ if (pr->MaxVols != 0 && pr->MaxVols < pr->NumVols) {
+ pr->MaxVols = pr->NumVols;
+ }
+ }
+ pr->UseOnce = pool->use_volume_once;
+ pr->UseCatalog = pool->use_catalog;
+ pr->AcceptAnyVolume = pool->accept_any_volume;
+ pr->Recycle = pool->Recycle;
+ pr->VolRetention = pool->VolRetention;
+ pr->VolUseDuration = pool->VolUseDuration;
+ pr->MaxVolJobs = pool->MaxVolJobs;
+ pr->MaxVolFiles = pool->MaxVolFiles;
+ pr->MaxVolBytes = pool->MaxVolBytes;
+ if (pool->label_format) {
+ strcpy(pr->LabelFormat, pool->label_format);
+ } else {
+ strcpy(pr->LabelFormat, "*"); /* none */
+ }
+}
+
+
/*
* Create a pool record from a given Pool resource
* Also called from backup.c
* 1 record created
*/
-int create_pool(B_DB *db, POOL *pool)
+int create_pool(JCR *jcr, B_DB *db, POOL *pool, int create)
{
POOL_DBR pr;
strcpy(pr.Name, pool->hdr.name);
- if (db_get_pool_record(db, &pr)) {
+ if (db_get_pool_record(jcr, db, &pr)) {
+ /* Pool Exists */
+ if (!create) { /* update request */
+ set_pooldbr_from_poolres(&pr, pool, 0);
+ db_update_pool_record(jcr, db, &pr);
+ }
return 0; /* exists */
}
- strcpy(pr.PoolType, pool->pool_type);
- pr.MaxVols = pool->max_volumes;
- pr.NumVols = 0;
- pr.UseOnce = pool->use_volume_once;
- pr.UseCatalog = pool->use_catalog;
- pr.AcceptAnyVolume = pool->accept_any_volume;
- pr.Recycle = pool->Recycle;
- pr.VolRetention = pool->VolRetention;
- pr.AutoPrune = pool->AutoPrune;
- if (pool->label_format) {
- strcpy(pr.LabelFormat, pool->label_format);
- } else {
- strcpy(pr.LabelFormat, "*"); /* none */
- }
+ set_pooldbr_from_poolres(&pr, pool, 1);
- if (!db_create_pool_record(db, &pr)) {
+ if (!db_create_pool_record(jcr, db, &pr)) {
return -1; /* error */
}
return 1;
return 1;
}
- switch (create_pool(ua->db, pool)) {
+ switch (create_pool(ua->jcr, ua->db, pool, 1)) {
case 0:
bsendmsg(ua, _("Error: Pool %s already exists.\n\
Use update to change it.\n"), pool->hdr.name);
static int updatecmd(UAContext *ua, char *cmd)
{
static char *kw[] = {
- N_("media"),
- N_("volume"),
- N_("pool"),
+ N_("media"), /* 0 */
+ N_("volume"), /* 1 */
+ N_("pool"), /* 2 */
+ N_("slots"), /* 3 */
NULL};
if (!open_db(ua)) {
case 2:
update_pool(ua);
return 1;
+ case 3:
+ update_slots(ua);
+ return 1;
default:
break;
}
start_prompt(ua, _("Update choice:\n"));
add_prompt(ua, _("Volume parameters"));
add_prompt(ua, _("Pool from resource"));
- switch (do_prompt(ua, _("Choose catalog item to update"), NULL)) {
+ add_prompt(ua, _("Slots from autochanger"));
+ switch (do_prompt(ua, _("Choose catalog item to update"), NULL, 0)) {
case 0:
update_volume(ua);
break;
case 1:
update_pool(ua);
break;
+ case 2:
+ update_slots(ua);
+ break;
default:
break;
}
*/
static int update_volume(UAContext *ua)
{
- POOL_DBR pr;
MEDIA_DBR mr;
POOLMEM *query;
char ed1[30];
- if (!select_pool_and_media_dbr(ua, &pr, &mr)) {
- return 0;
- }
for (int done=0; !done; ) {
- if (!db_get_media_record(ua->db, &mr)) {
- if (mr.MediaId != 0) {
- bsendmsg(ua, _("Volume record for MediaId %d not found.\n"), mr.MediaId);
- } else {
- bsendmsg(ua, _("Volume record for %s not found.\n"), mr.VolumeName);
- }
+ if (!select_media_dbr(ua, &mr)) {
return 0;
}
- bsendmsg(ua, _("Updating Volume %s\n"), mr.VolumeName);
+ bsendmsg(ua, _("Updating Volume \"%s\"\n"), mr.VolumeName);
start_prompt(ua, _("Parameters to modify:\n"));
add_prompt(ua, _("Volume Status"));
add_prompt(ua, _("Volume Retention Period"));
+ add_prompt(ua, _("Volume Use Duration"));
+ add_prompt(ua, _("Maximum Volume Jobs"));
+ add_prompt(ua, _("Maximum Volume Files"));
+ add_prompt(ua, _("Maximum Volume Bytes"));
add_prompt(ua, _("Recycle Flag"));
add_prompt(ua, _("Slot"));
+ add_prompt(ua, _("Volume Files"));
add_prompt(ua, _("Done"));
- switch (do_prompt(ua, _("Select parameter to modify"), NULL)) {
+ switch (do_prompt(ua, _("Select parameter to modify"), NULL, 0)) {
case 0: /* Volume Status */
/* Modify Volume Status */
- bsendmsg(ua, _("Current value is: %s\n"), mr.VolStatus);
+ bsendmsg(ua, _("Current Volume status is: %s\n"), mr.VolStatus);
start_prompt(ua, _("Possible Values are:\n"));
- add_prompt(ua, "Append");
- add_prompt(ua, "Archive");
+ add_prompt(ua, "Append"); /* Better not translate these as */
+ add_prompt(ua, "Archive"); /* They are known in the database code */
add_prompt(ua, "Disabled");
add_prompt(ua, "Full");
+ add_prompt(ua, "Used");
+ add_prompt(ua, "Cleaning");
if (strcmp(mr.VolStatus, "Purged") == 0) {
add_prompt(ua, "Recycle");
}
add_prompt(ua, "Read-Only");
- if (do_prompt(ua, _("Choose new Volume Status"), ua->cmd) < 0) {
+ if (do_prompt(ua, _("Choose new Volume Status"), ua->cmd, sizeof(mr.VolStatus)) < 0) {
return 1;
}
- strcpy(mr.VolStatus, ua->cmd);
+ bstrncpy(mr.VolStatus, ua->cmd, sizeof(mr.VolStatus));
query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "UPDATE Media SET VolStatus='%s' WHERE MediaId=%d",
+ 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));
- }
+ } else {
+ bsendmsg(ua, _("New Volume status is: %s\n"), mr.VolStatus);
+ }
free_pool_memory(query);
break;
case 1: /* Retention */
- bsendmsg(ua, _("Current value is: %s\n"),
- edit_btime(mr.VolRetention, ed1));
+ bsendmsg(ua, _("Current retention seconds is: %s\n"),
+ edit_utime(mr.VolRetention, ed1));
if (!get_cmd(ua, _("Enter Volume Retention period: "))) {
return 0;
}
- if (!string_to_btime(ua->cmd, &mr.VolRetention)) {
+ if (!duration_to_utime(ua->cmd, &mr.VolRetention)) {
bsendmsg(ua, _("Invalid retention period specified.\n"));
break;
}
query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "UPDATE Media SET VolRetention=%s WHERE MediaId=%d",
+ 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));
+ }
+ free_pool_memory(query);
+ break;
+
+ case 2: /* Use Duration */
+ bsendmsg(ua, _("Current use duration is: %s\n"),
+ edit_utime(mr.VolUseDuration, ed1));
+ if (!get_cmd(ua, _("Enter Volume Use Duration: "))) {
+ return 0;
+ }
+ if (!duration_to_utime(ua->cmd, &mr.VolUseDuration)) {
+ bsendmsg(ua, _("Invalid use duration specified.\n"));
+ break;
+ }
+ query = get_pool_memory(PM_MESSAGE);
+ 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));
+ }
free_pool_memory(query);
break;
- case 2: /* Recycle */
- int recycle;
- bsendmsg(ua, _("Current value is: %s\n"),
- mr.Recycle==1?_("yes"):_("no"));
- if (!get_cmd(ua, _("Enter new Recycle status: "))) {
+
+ case 3: /* Max Jobs */
+ int32_t maxjobs;
+ bsendmsg(ua, _("Current max jobs is: %u\n"), mr.MaxVolJobs);
+ if (!get_pint(ua, _("Enter new Maximum Jobs: "))) {
+ return 0;
+ }
+ maxjobs = ua->pint32_val;
+ query = get_pool_memory(PM_MESSAGE);
+ Mmsg(&query, "UPDATE Media SET MaxVolJobs=%u WHERE MediaId=%u",
+ maxjobs, mr.MediaId);
+ if (!db_sql_query(ua->db, query, NULL, NULL)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
+ } else {
+ bsendmsg(ua, _("New max jobs is: %u\n"), maxjobs);
+ }
+ free_pool_memory(query);
+ break;
+
+ case 4: /* Max Files */
+ int32_t maxfiles;
+ bsendmsg(ua, _("Current max files is: %u\n"), mr.MaxVolFiles);
+ if (!get_pint(ua, _("Enter new Maximum Files: "))) {
return 0;
}
- if (strcasecmp(ua->cmd, _("yes")) == 0) {
- recycle = 1;
- } else if (strcasecmp(ua->cmd, _("no")) == 0) {
- recycle = 0;
+ maxfiles = ua->pint32_val;
+ query = get_pool_memory(PM_MESSAGE);
+ Mmsg(&query, "UPDATE Media SET MaxVolFiles=%u WHERE MediaId=%u",
+ maxfiles, mr.MediaId);
+ if (!db_sql_query(ua->db, query, NULL, NULL)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
} else {
- bsendmsg(ua, _("Invalid recycle status specified.\n"));
+ bsendmsg(ua, _("New max files is: %u\n"), maxfiles);
+ }
+ free_pool_memory(query);
+ break;
+
+ case 5: /* Max Bytes */
+ uint64_t maxbytes;
+ bsendmsg(ua, _("Current value is: %s\n"), edit_uint64(mr.MaxVolBytes, ed1));
+ if (!get_cmd(ua, _("Enter new Maximum Bytes: "))) {
+ return 0;
+ }
+ if (!size_to_uint64(ua->cmd, strlen(ua->cmd), &maxbytes)) {
+ bsendmsg(ua, _("Invalid byte size specification.\n"));
break;
+ }
+ query = get_pool_memory(PM_MESSAGE);
+ 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));
+ } else {
+ bsendmsg(ua, _("New Max bytes is: %s\n"), edit_uint64(maxbytes, ed1));
}
+ free_pool_memory(query);
+ break;
+
+
+ case 6: /* Recycle */
+ int recycle;
+ bsendmsg(ua, _("Current recycle flag is: %s\n"),
+ mr.Recycle==1?_("yes"):_("no"));
+ if (!get_yesno(ua, _("Enter new Recycle status: "))) {
+ return 0;
+ }
+ recycle = ua->pint32_val;
query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "UPDATE Media SET Recycle=%d WHERE MediaId=%d",
+ 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));
- }
+ } else {
+ bsendmsg(ua, _("New recycle flag is: %s\n"),
+ mr.Recycle==1?_("yes"):_("no"));
+ }
free_pool_memory(query);
break;
- case 3: /* Slot */
+ case 7: /* Slot */
int slot;
- bsendmsg(ua, _("Current value is: %d\n"), mr.Slot);
- if (!get_cmd(ua, _("Enter new Slot: "))) {
+ POOL_DBR pr;
+
+ 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;
}
- slot = atoi(ua->cmd);
- if (slot < 0) {
- bsendmsg(ua, _("Invalid slot, it must be 0 or greater\n"));
- break;
- } else if (pr.MaxVols > 0 && slot >(int)pr.MaxVols) {
+ bsendmsg(ua, _("Current Slot is: %d\n"), mr.Slot);
+ if (!get_pint(ua, _("Enter new Slot: "))) {
+ return 0;
+ }
+ 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=%d",
+ 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));
} else {
- bsendmsg(ua, "New value is: %d\n", slot);
+ bsendmsg(ua, "New Slot is: %d\n", slot);
+ }
+ free_pool_memory(query);
+ break;
+
+ case 8: /* Volume Files */
+ int32_t VolFiles;
+ bsendmsg(ua, _("Warning changing Volume Files can result\n"
+ "in loss of data on your Volume\n\n"));
+ bsendmsg(ua, _("Current Volume Files is: %u\n"), mr.VolFiles);
+ if (!get_pint(ua, _("Enter new number of Files for Volume: "))) {
+ return 0;
+ }
+ VolFiles = ua->pint32_val;
+ if (VolFiles != (int)(mr.VolFiles + 1)) {
+ bsendmsg(ua, _("Normally, you should only increase Volume Files by one!\n"));
+ if (!get_yesno(ua, _("Continue? (yes/no): ")) || ua->pint32_val == 0) {
+ break;
+ }
+ }
+ query = get_pool_memory(PM_MESSAGE);
+ 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));
+ } else {
+ bsendmsg(ua, _("New Volume Files is: %u\n"), VolFiles);
}
free_pool_memory(query);
break;
-
default: /* Done or error */
bsendmsg(ua, "Selection done.\n");
return 1;
POOL_DBR pr;
int id;
POOL *pool;
+ POOLMEM *query;
pool = get_pool_resource(ua);
if (!get_pool_dbr(ua, &pr)) {
return 0;
}
- strcpy(pr.PoolType, pool->pool_type);
- if (pr.MaxVols != (uint32_t) (pool->max_volumes)) {
- pr.MaxVols = pool->max_volumes;
- }
- if (pr.MaxVols != 0 && pr.MaxVols < pr.NumVols) {
- pr.MaxVols = pr.NumVols;
- }
- pr.UseOnce = pool->use_volume_once;
- pr.UseCatalog = pool->use_catalog;
- pr.AcceptAnyVolume = pool->accept_any_volume;
- pr.VolRetention = pool->VolRetention;
- if (pool->label_format) {
- strcpy(pr.LabelFormat, pool->label_format);
- } else {
- strcpy(pr.LabelFormat, "*"); /* none */
- }
- id = db_update_pool_record(ua->db, &pr);
+
+ set_pooldbr_from_poolres(&pr, pool, 0); /* update */
+
+ id = db_update_pool_record(ua->jcr, ua->db, &pr);
if (id <= 0) {
bsendmsg(ua, _("db_update_pool_record returned %d. ERR=%s\n"),
id, db_strerror(ua->db));
}
+ query = get_pool_memory(PM_MESSAGE);
+ Mmsg(&query, list_pool, pr.PoolId);
+ db_list_sql_query(ua->jcr, ua->db, query, prtit, ua, 1, 0);
+ free_pool_memory(query);
bsendmsg(ua, _("Pool DB record updated from resource.\n"));
return 1;
}
Dmsg1(120, "setdebug:%s:\n", cmd);
level = -1;
- for (i=1; i<ua->argc; i++) {
- if (strcasecmp(ua->argk[i], _("level")) == 0 && ua->argv[i]) {
- level = atoi(ua->argv[i]);
- break;
- }
+ i = find_arg_with_value(ua, _("level"));
+ if (i >= 0) {
+ level = atoi(ua->argv[i]);
}
if (level < 0) {
- if (!get_cmd(ua, _("Enter new debug level: "))) {
+ if (!get_pint(ua, _("Enter new debug level: "))) {
return 1;
}
- level = atoi(ua->cmd);
- }
- if (level < 0) {
- bsendmsg(ua, _("level cannot be negative.\n"));
- return 1;
+ level = ua->pint32_val;
}
/* General debug? */
if (strcasecmp(ua->argk[i], _("client")) == 0) {
client = NULL;
if (ua->argv[i]) {
- client = (CLIENT *) GetResWithName(R_CLIENT, ua->argv[i]);
+ client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
if (client) {
do_client_setdebug(ua, client, level);
return 1;
do_client_setdebug(ua, client, level);
return 1;
}
+ }
- store = get_storage_resource(ua, cmd);
+ if (strcasecmp(ua->argk[i], _("store")) == 0 ||
+ strcasecmp(ua->argk[i], _("storage")) == 0) {
+ store = NULL;
+ if (ua->argv[i]) {
+ store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]);
+ if (store) {
+ do_storage_setdebug(ua, store, level);
+ return 1;
+ }
+ }
+ store = get_storage_resource(ua, 0);
if (store) {
do_storage_setdebug(ua, store, level);
return 1;
add_prompt(ua, _("Storage"));
add_prompt(ua, _("Client"));
add_prompt(ua, _("All"));
- switch(do_prompt(ua, _("Select daemon type to set debug level"), NULL)) {
+ switch(do_prompt(ua, _("Select daemon type to set debug level"), NULL, 0)) {
case 0: /* Director */
debug_level = level;
break;
case 1:
- store = get_storage_resource(ua, cmd);
+ store = get_storage_resource(ua, 0);
if (store) {
do_storage_setdebug(ua, store, level);
}
return 1;
}
+/*
+ * print time
+ */
+static int timecmd(UAContext *ua, char *cmd)
+{
+ char sdt[50];
+ time_t ttime = time(NULL);
+ struct tm tm;
+ localtime_r(&ttime, &tm);
+ strftime(sdt, sizeof(sdt), "%d-%b-%Y %H:%M:%S", &tm);
+ bsendmsg(ua, "%s\n", sdt);
+ return 1;
+}
+
/*
*/
static int delete_volume(UAContext *ua)
{
- POOL_DBR pr;
MEDIA_DBR mr;
- if (!select_pool_and_media_dbr(ua, &pr, &mr)) {
+ if (!select_media_dbr(ua, &mr)) {
return 1;
}
bsendmsg(ua, _("\nThis command will delete volume %s\n"
"and all Jobs saved on that volume from the Catalog\n"),
mr.VolumeName);
- if (!get_cmd(ua, _("Are you sure you want to delete this Volume? (yes/no): "))) {
+ if (!get_yesno(ua, _("Are you sure you want to delete this Volume? (yes/no): "))) {
return 1;
}
- if (strcasecmp(ua->cmd, _("yes")) == 0) {
- db_delete_media_record(ua->db, &mr);
+ if (ua->pint32_val) {
+ db_delete_media_record(ua->jcr, ua->db, &mr);
}
return 1;
}
if (!get_pool_dbr(ua, &pr)) {
return 1;
}
- if (!get_cmd(ua, _("Are you sure you want to delete this Pool? (yes/no): "))) {
+ if (!get_yesno(ua, _("Are you sure you want to delete this Pool? (yes/no): "))) {
return 1;
}
- if (strcasecmp(ua->cmd, _("yes")) == 0) {
- db_delete_pool_record(ua->db, &pr);
+ if (ua->pint32_val) {
+ db_delete_pool_record(ua->jcr, ua->db, &pr);
}
return 1;
}
-/*
- * Label a tape
- *
- * label storage=xxx volume=vvv
- */
-static int labelcmd(UAContext *ua, char *cmd)
-{
- STORE *store;
- BSOCK *sd;
- char dev_name[MAX_NAME_LENGTH];
- MEDIA_DBR mr;
- POOL_DBR pr;
- int ok = FALSE;
- int mounted = FALSE;
- int i;
- int slot = 0;
- static char *keyword[] = {
- "volume",
- NULL};
-
- if (!open_db(ua)) {
- return 1;
- }
- store = get_storage_resource(ua, cmd);
- if (!store) {
- return 1;
- }
-
- i = find_arg_keyword(ua, keyword);
- if (i >=0 && ua->argv[i]) {
- strcpy(ua->cmd, ua->argv[i]);
- goto gotVol;
- }
-
-getVol:
- if (!get_cmd(ua, _("Enter new Volume name: "))) {
- return 1;
- }
-gotVol:
- if (strchr(ua->cmd, '|')) {
- bsendmsg(ua, _("Illegal character | in a volume name.\n"));
- goto getVol;
- }
- if (strlen(ua->cmd) >= MAX_NAME_LENGTH) {
- bsendmsg(ua, _("Volume name too long.\n"));
- goto getVol;
- }
- if (strlen(ua->cmd) == 0) {
- bsendmsg(ua, _("Volume name must be at least one character long.\n"));
- goto getVol;
- }
-
-
- memset(&mr, 0, sizeof(mr));
- strcpy(mr.VolumeName, ua->cmd);
- if (db_get_media_record(ua->db, &mr)) {
- bsendmsg(ua, _("Media record for Volume %s already exists.\n"),
- mr.VolumeName);
- return 1;
- }
-
- /* Do some more checking on slot ****FIXME**** */
- if (store->autochanger) {
- if (!get_cmd(ua, _("Enter slot (0 for none): "))) {
- return 1;
- }
- slot = atoi(ua->cmd);
- }
- strcpy(mr.MediaType, store->media_type);
- mr.Slot = slot;
-
- memset(&pr, 0, sizeof(pr));
- if (!select_pool_dbr(ua, &pr)) {
- return 1;
- }
- mr.PoolId = pr.PoolId;
- strcpy(mr.VolStatus, "Append");
- mr.Recycle = pr.Recycle;
- mr.VolRetention = pr.VolRetention;
-
- ua->jcr->store = store;
- bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d ...\n"),
- store->hdr.name, store->address, store->SDport);
- if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
- bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
- return 1;
- }
- sd = ua->jcr->store_bsock;
- strcpy(dev_name, store->dev_name);
- bash_spaces(dev_name);
- bash_spaces(mr.VolumeName);
- bash_spaces(mr.MediaType);
- bash_spaces(pr.Name);
- bnet_fsend(sd, _("label %s VolumeName=%s PoolName=%s MediaType=%s Slot=%d"),
- dev_name, mr.VolumeName, pr.Name, mr.MediaType, mr.Slot);
- bsendmsg(ua, "Sending label command ...\n");
- while (bget_msg(sd, 0) >= 0) {
- bsendmsg(ua, "%s", sd->msg);
- if (strncmp(sd->msg, "3000 OK label.", 14) == 0) {
- ok = TRUE;
- }
- }
- ua->jcr->store_bsock = NULL;
- unbash_spaces(dev_name);
- unbash_spaces(mr.VolumeName);
- unbash_spaces(mr.MediaType);
- unbash_spaces(pr.Name);
- if (ok) {
- if (db_create_media_record(ua->db, &mr)) {
- bsendmsg(ua, _("Media record for Volume=%s successfully created.\n"),
- mr.VolumeName);
- if (ua->automount) {
- bsendmsg(ua, _("Requesting mount %s ...\n"), dev_name);
- bash_spaces(dev_name);
- bnet_fsend(sd, "mount %s", dev_name);
- unbash_spaces(dev_name);
- while (bnet_recv(sd) >= 0) {
- bsendmsg(ua, "%s", sd->msg);
- /* Here we can get
- * 3001 OK mount. Device=xxx or
- * 3001 Mounted Volume vvvv
- */
- if (strncmp(sd->msg, "3001 ", 5) == 0) {
- mounted = TRUE;
- /***** ****FIXME***** find job waiting for
- ***** mount, and change to waiting for SD
- */
- }
- }
- }
- } else {
- bsendmsg(ua, "%s", db_strerror(ua->db));
- }
- }
- if (!mounted) {
- bsendmsg(ua, _("Do not forget to mount the drive!!!\n"));
- }
- bnet_sig(sd, BNET_TERMINATE);
- bnet_close(sd);
- return 1;
-}
-
static void do_mount_cmd(int mount, UAContext *ua, char *cmd)
{
STORE *store;
}
Dmsg1(120, "mount: %s\n", ua->UA_sock->msg);
- store = get_storage_resource(ua, cmd);
+ store = get_storage_resource(ua, 1);
if (!store) {
return;
}
return 1;
}
+/*
+ * Wait until no job is running
+ */
+int waitcmd(UAContext *ua, char *cmd)
+{
+ bmicrosleep(0, 200000); /* let job actually start */
+ for (int running=1; running; ) {
+ running = 0;
+ lock_jcr_chain();
+ for (JCR *jcr=NULL; (jcr=get_next_jcr(jcr)); ) {
+ if (jcr->JobId != 0) {
+ running = 1;
+ free_locked_jcr(jcr);
+ break;
+ }
+ free_locked_jcr(jcr);
+ }
+ unlock_jcr_chain();
+ if (running) {
+ bmicrosleep(1, 0);
+ }
+ }
+ return 1;
+}
+
+
static int helpcmd(UAContext *ua, char *cmd)
{
unsigned int i;
static int versioncmd(UAContext *ua, char *cmd)
{
- bsendmsg(ua, "%s Version: " VERSION " (" DATE ")\n", my_name);
+ bsendmsg(ua, "%s Version: " VERSION " (" BDATE ")\n", my_name);
return 1;
}
ua->catalog = (CAT *)GetNextRes(R_CATALOG, NULL);
UnlockRes();
if (!ua->catalog) {
- bnet_fsend(ua->UA_sock, _("Could not find a Catalog resource\n"));
+ bsendmsg(ua, _("Could not find a Catalog resource\n"));
return 0;
} else {
- bnet_fsend(ua->UA_sock, _("Using default Catalog name=%s DB=%s\n"),
+ bsendmsg(ua, _("Using default Catalog name=%s DB=%s\n"),
ua->catalog->hdr.name, ua->catalog->db_name);
}
}
Dmsg0(150, "Open database\n");
- ua->db = db_init_database(NULL, ua->catalog->db_name, ua->catalog->db_user,
- ua->catalog->db_password);
- if (!db_open_database(ua->db)) {
- bnet_fsend(ua->UA_sock, _("Could not open DB %s: ERR=%s"),
+ ua->db = db_init_database(ua->jcr, ua->catalog->db_name, ua->catalog->db_user,
+ ua->catalog->db_password, ua->catalog->db_address,
+ ua->catalog->db_port, ua->catalog->db_socket);
+ if (!db_open_database(ua->jcr, ua->db)) {
+ bsendmsg(ua, _("Could not open DB %s: ERR=%s"),
ua->catalog->db_name, db_strerror(ua->db));
close_db(ua);
return 0;
void close_db(UAContext *ua)
{
if (ua->db) {
- db_close_database(ua->db);
+ db_close_database(ua->jcr, ua->db);
}
ua->db = NULL;
ua->jcr->db = NULL;
projects / bacula / bacula / blobdiff