X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_cmds.c;h=063127981d3599e7861495c3d78c909d63e3a233;hb=b9ac1b6c82fd69ecf139edce98585a889906db8b;hp=30d2476c79b63b2d66283b8d777b9f02cabefbb3;hpb=2643cdaa7a761d6d9ff906f26794d781c01c017d;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c index 30d2476c79..063127981d 100644 --- a/bacula/src/dird/ua_cmds.c +++ b/bacula/src/dird/ua_cmds.c @@ -8,7 +8,7 @@ */ /* - 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 @@ -31,88 +31,96 @@ #include "dird.h" /* Imported subroutines */ -extern void run_job(JCR *jcr); /* Imported variables */ extern int r_first; 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 jobq_t job_queue; /* job queue */ 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 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 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); -extern int restorecmd(UAContext *ua, char *cmd); -extern int labelcmd(UAContext *ua, char *cmd); -extern int relabelcmd(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 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 setdebugcmd(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 versioncmd(UAContext *ua, char *cmd), automountcmd(UAContext *ua, char *cmd); -static int timecmd(UAContext *ua, char *cmd); +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 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); +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 setip_cmd(UAContext *ua, char *cmd); -int quitcmd(UAContext *ua, char *cmd); +int quit_cmd(UAContext *ua, char *cmd); struct cmdstruct { char *key; int (*func)(UAContext *ua, char *cmd); char *help; }; static struct cmdstruct commands[] = { - { N_("add"), addcmd, _("add media to a pool")}, + { N_("add"), add_cmd, _("add media to a pool")}, { N_("autodisplay"), autodisplaycmd, _("autodisplay [on/off] -- console messages")}, - { N_("automount"), automountcmd, _("automount [on/off] -- after label")}, - { N_("cancel"), cancelcmd, _("cancel job=nnn -- cancel a job")}, - { N_("create"), createcmd, _("create DB Pool from resource")}, - { N_("delete"), deletecmd, _("delete [pool= | media volume=]")}, - { 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 | files job=]; from catalog")}, - { N_("llist"), llistcmd, _("full or long list like list command")}, - { N_("messages"), messagescmd, _("messages")}, - { N_("mount"), mountcmd, _("mount ")}, - { N_("restore"), restorecmd, _("restore files")}, - { N_("prune"), prunecmd, _("prune expired records from catalog")}, - { N_("purge"), purgecmd, _("purge records from catalog")}, - { N_("run"), runcmd, _("run ")}, - { N_("setdebug"), setdebugcmd, _("sets debug level")}, - { N_("show"), showcmd, _("show (resource records) [jobs | pools | ... | all]")}, - { N_("sqlquery"), sqlquerycmd, _("use SQL to query catalog")}, - { N_("status"), statuscmd, _("status [storage | client]=")}, - { N_("unmount"), unmountcmd, _("unmount ")}, - { N_("update"), updatecmd, _("update Volume or Pool")}, - { N_("use"), usecmd, _("use catalog xxx")}, - { 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")}, + { 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= | media volume=]")}, + { 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 | files jobid=]; from catalog")}, + { N_("label"), label_cmd, _("label a tape")}, + { N_("llist"), llist_cmd, _("full or long list like list command")}, + { N_("messages"), messagescmd, _("messages")}, + { N_("mount"), mount_cmd, _("mount ")}, + { N_("prune"), prunecmd, _("prune expired records from catalog")}, + { N_("purge"), purgecmd, _("purge records from 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 ")}, + { N_("run"), run_cmd, _("run ")}, + { N_("status"), status_cmd, _("status [storage | client]=")}, + { 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_("unmount"), unmount_cmd, _("unmount ")}, + { N_("update"), update_cmd, _("update Volume or Pool")}, + { N_("use"), use_cmd, _("use catalog xxx")}, + { N_("var"), var_cmd, _("does variable expansion")}, + { N_("version"), version_cmd, _("print Director version")}, + { N_("wait"), wait_cmd, _("wait until no jobs are running")}, }; #define comsize (sizeof(commands)/sizeof(struct cmdstruct)) @@ -123,12 +131,11 @@ int do_a_command(UAContext *ua, 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; } @@ -136,15 +143,16 @@ int do_a_command(UAContext *ua, char *cmd) len = strlen(ua->argk[0]); for (i=0; iargk[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; } @@ -157,7 +165,7 @@ int do_a_command(UAContext *ua, char *cmd) void set_pool_dbr_defaults_in_media_dbr(MEDIA_DBR *mr, POOL_DBR *pr) { mr->PoolId = pr->PoolId; - strcpy(mr->VolStatus, "Append"); + bstrncpy(mr->VolStatus, "Append", sizeof(mr->VolStatus)); mr->Recycle = pr->Recycle; mr->VolRetention = pr->VolRetention; mr->VolUseDuration = pr->VolUseDuration; @@ -170,7 +178,7 @@ void set_pool_dbr_defaults_in_media_dbr(MEDIA_DBR *mr, POOL_DBR *pr) /* * Add Volumes to an existing Pool */ -static int addcmd(UAContext *ua, char *cmd) +static int add_cmd(UAContext *ua, char *cmd) { POOL_DBR pr; MEDIA_DBR mr; @@ -178,7 +186,7 @@ static int addcmd(UAContext *ua, char *cmd) 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" @@ -211,7 +219,7 @@ static int addcmd(UAContext *ua, char *cmd) /* Get media type */ if ((store = get_storage_resource(ua, 0)) != NULL) { - strcpy(mr.MediaType, store->media_type); + bstrncpy(mr.MediaType, store->media_type, sizeof(mr.MediaType)); } else if (!get_media_type(ua, mr.MediaType, sizeof(mr.MediaType))) { return 1; } @@ -223,7 +231,7 @@ static int addcmd(UAContext *ua, char *cmd) } for (;;) { char buf[100]; - sprintf(buf, _("Enter number of Volumes to create. 0=>fixed name. Max=%d: "), max); + bsnprintf(buf, sizeof(buf), _("Enter number of Volumes to create. 0=>fixed name. Max=%d: "), max); if (!get_pint(ua, buf)) { return 1; } @@ -245,8 +253,7 @@ getVolName: } } /* Don't allow | in Volume name because it is the volume separator character */ - if (strchr(ua->cmd, '|')) { - bsendmsg(ua, _("Illegal character | in a volume name.\n")); + if (!is_volume_name_legal(ua, ua->cmd)) { goto getVolName; } if (strlen(ua->cmd) >= MAX_NAME_LENGTH-10) { @@ -258,7 +265,7 @@ getVolName: goto getVolName; } - strcpy(name, ua->cmd); + bstrncpy(name, ua->cmd, sizeof(name)); if (num > 0) { strcat(name, "%04d"); @@ -282,13 +289,18 @@ getVolName: 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++) { - sprintf(mr.VolumeName, name, i); - mr.Slot = slot++; + bsnprintf(mr.VolumeName, sizeof(mr.VolumeName), name, i); + 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)); @@ -315,7 +327,7 @@ getVolName: * automount on * automount off */ -int automountcmd(UAContext *ua, char *cmd) +int automount_cmd(UAContext *ua, char *cmd) { char *onoff; @@ -336,11 +348,10 @@ int automountcmd(UAContext *ua, char *cmd) /* * Cancel a job */ -static int cancelcmd(UAContext *ua, char *cmd) +static int cancel_cmd(UAContext *ua, char *cmd) { - int i; + int i, ret; int njobs = 0; - BSOCK *sd, *fd; JCR *jcr = NULL; char JobName[MAX_NAME_LENGTH]; @@ -350,11 +361,13 @@ static int cancelcmd(UAContext *ua, char *cmd) for (i=1; iargc; 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; @@ -375,13 +388,13 @@ static int cancelcmd(UAContext *ua, char *cmd) 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(); @@ -391,7 +404,7 @@ static int cancelcmd(UAContext *ua, char *cmd) } 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; @@ -401,7 +414,7 @@ static int cancelcmd(UAContext *ua, char *cmd) } unlock_jcr_chain(); - if (do_prompt(ua, _("Choose Job to cancel"), JobName, sizeof(JobName)) < 0) { + if (do_prompt(ua, _("Job"), _("Choose Job to cancel"), JobName, sizeof(JobName)) < 0) { return 1; } if (njobs == 1) { @@ -409,73 +422,18 @@ static int cancelcmd(UAContext *ua, char *cmd) return 1; } } + /* NOTE! This increments the ref_count */ jcr = get_jcr_by_full_name(JobName); if (!jcr) { bsendmsg(ua, _("Job %s not found.\n"), JobName); return 1; } } - - switch (jcr->JobStatus) { - case JS_Created: - 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); - - /* Cancel File daemon */ - 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; - } - /* Cancel Storage daemon */ - 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; - } - } + ret = cancel_job(ua, jcr); free_jcr(jcr); - return 1; + return ret; } /* @@ -485,10 +443,10 @@ static int cancelcmd(UAContext *ua, char *cmd) * 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) +static void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op) { strcpy(pr->PoolType, pool->pool_type); - if (create) { + if (op == POOL_OP_CREATE) { pr->MaxVols = pool->max_volumes; pr->NumVols = 0; } else { /* update pool */ @@ -508,6 +466,8 @@ void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, int create) pr->MaxVolJobs = pool->MaxVolJobs; pr->MaxVolFiles = pool->MaxVolFiles; pr->MaxVolBytes = pool->MaxVolBytes; + pr->AutoPrune = pool->AutoPrune; + pr->Recycle = pool->Recycle; if (pool->label_format) { strcpy(pr->LabelFormat, pool->label_format); } else { @@ -524,7 +484,7 @@ void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, int create) * 1 record created */ -int create_pool(JCR *jcr, B_DB *db, POOL *pool, int create) +int create_pool(JCR *jcr, B_DB *db, POOL *pool, e_pool_op op) { POOL_DBR pr; @@ -534,14 +494,14 @@ int create_pool(JCR *jcr, B_DB *db, POOL *pool, int create) if (db_get_pool_record(jcr, db, &pr)) { /* Pool Exists */ - if (!create) { /* update request */ - set_pooldbr_from_poolres(&pr, pool, 0); + if (op == POOL_OP_UPDATE) { /* update request */ + set_pooldbr_from_poolres(&pr, pool, op); db_update_pool_record(jcr, db, &pr); } return 0; /* exists */ } - set_pooldbr_from_poolres(&pr, pool, 1); + set_pooldbr_from_poolres(&pr, pool, op); if (!db_create_pool_record(jcr, db, &pr)) { return -1; /* error */ @@ -555,7 +515,7 @@ int create_pool(JCR *jcr, B_DB *db, POOL *pool, int create) * Create a Pool Record in the database. * It is always created from the Resource record. */ -static int createcmd(UAContext *ua, char *cmd) +static int create_cmd(UAContext *ua, char *cmd) { POOL *pool; @@ -568,10 +528,10 @@ static int createcmd(UAContext *ua, char *cmd) return 1; } - switch (create_pool(ua->jcr, ua->db, pool, 1)) { + 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: @@ -586,6 +546,34 @@ Use update to change it.\n"), pool->hdr.name); } +/* + * 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, char *cmd) +{ + CLIENT *client; + if (!ua->cons || !acl_access_ok(ua, Client_ACL, ua->cons->hdr.name)) { + bsendmsg(ua, _("Illegal command from this console.\n")); + return 1; + } + client = (CLIENT *)GetResWithName(R_CLIENT, ua->cons->hdr.name); + + if (!client) { + bsendmsg(ua, _("Client \"%s\" not found.\n"), ua->cons->hdr.name); + return 1; + } + LockRes(); + if (client->address) { + free(client->address); + } + client->address = bstrdup(inet_ntoa(ua->UA_sock->client_addr.sin_addr)); + bsendmsg(ua, _("Client \"%s\" address set to %s\n"), + client->hdr.name, client->address); + UnlockRes(); + return 1; +} /* @@ -597,7 +585,7 @@ Use update to change it.\n"), pool->hdr.name); * update media pool= volume= * changes pool info for volume */ -static int updatecmd(UAContext *ua, char *cmd) +static int update_cmd(UAContext *ua, char *cmd) { static char *kw[] = { N_("media"), /* 0 */ @@ -611,40 +599,211 @@ static int updatecmd(UAContext *ua, char *cmd) } switch (find_arg_keyword(ua, kw)) { - case 0: - case 1: - update_volume(ua); - return 1; - case 2: - update_pool(ua); - return 1; - case 3: - update_slots(ua); - return 1; - default: - break; + case 0: + case 1: + update_volume(ua); + return 1; + 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")); 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; + switch (do_prompt(ua, _("item"), _("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; } return 1; } +static void update_volstatus(UAContext *ua, char *val, MEDIA_DBR *mr) +{ + POOLMEM *query = get_pool_memory(PM_MESSAGE); + char *kw[] = { + "Append", + "Archive", + "Disabled", + "Full", + "Used", + "Cleaning", + "Recycle", + "Read-Only", + NULL}; + bool found = false; + int i; + + for (i=0; kw[i]; i++) { + if (strcasecmp(val, kw[i]) == 0) { + found = true; + break; + } + } + if (!found) { + 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", + 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); +} + +static void update_volretention(UAContext *ua, char *val, MEDIA_DBR *mr) +{ + char ed1[50]; + 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", + 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); +} + +static void update_voluseduration(UAContext *ua, char *val, MEDIA_DBR *mr) +{ + char ed1[50]; + POOLMEM *query; + + if (!duration_to_utime(val, &mr->VolUseDuration)) { + bsendmsg(ua, _("Invalid use duration specified: %s\n"), val); + return; + } + 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); +} + +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", + val, 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: %s\n"), val); + } + free_pool_memory(query); +} + +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", + val, mr->MediaId); + if (!db_sql_query(ua->db, query, NULL, NULL)) { + bsendmsg(ua, "%s", db_strerror(ua->db)); + } else { + bsendmsg(ua, _("New max files is: %s\n"), val); + } + free_pool_memory(query); +} + +static void update_volmaxbytes(UAContext *ua, char *val, MEDIA_DBR *mr) +{ + uint64_t maxbytes; + char ed1[50]; + POOLMEM *query; + + if (!size_to_uint64(val, strlen(val), &maxbytes)) { + bsendmsg(ua, _("Invalid max. bytes specification: %s\n"), val); + return; + } + 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); +} + +static void update_volrecycle(UAContext *ua, char *val, MEDIA_DBR *mr) +{ + int recycle; + POOLMEM *query; + if (strcasecmp(val, _("yes")) == 0) { + recycle = 1; + } else if (strcasecmp(val, _("no")) == 0) { + recycle = 0; + } else { + bsendmsg(ua, _("Invalid value. It must by yes or no.\n")); + return; + } + query = get_pool_memory(PM_MESSAGE); + 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); +} + +/* 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 @@ -654,11 +813,57 @@ static int updatecmd(UAContext *ua, char *cmd) static int update_volume(UAContext *ua) { MEDIA_DBR mr; + POOL_DBR pr; POOLMEM *query; char ed1[30]; + bool done = false; + char *kw[] = { + N_("VolStatus"), /* 0 */ + N_("VolRetention"), /* 1 */ + N_("VolUse"), /* 2 */ + N_("MaxVolJobs"), /* 3 */ + N_("MaxVolFiles"), /* 4 */ + N_("MaxVolBytes"), /* 5 */ + N_("Recycle"), /* 6 */ + N_("Pool"), /* 7 */ + NULL }; + + for (int i=0; kw[i]; i++) { + int j; + if ((j=find_arg_with_value(ua, kw[i])) > 0) { + if (!select_media_dbr(ua, &mr)) { + return 0; + } + switch (i) { + case 0: + update_volstatus(ua, ua->argv[j], &mr); + break; + case 1: + update_volretention(ua, ua->argv[j], &mr); + break; + case 2: + update_voluseduration(ua, ua->argv[j], &mr); + break; + case 3: + update_volmaxjobs(ua, ua->argv[j], &mr); + break; + case 4: + update_volmaxfiles(ua, ua->argv[j], &mr); + break; + case 5: + update_volmaxbytes(ua, ua->argv[j], &mr); + break; + case 6: + update_volrecycle(ua, ua->argv[j], &mr); + break; + case 7: + update_volpool(ua, ua->argv[j], &mr); + } + done = true; + } + } - - for (int done=0; !done; ) { + for ( ; !done; ) { if (!select_media_dbr(ua, &mr)) { return 0; } @@ -672,9 +877,11 @@ static int update_volume(UAContext *ua) 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)) { + switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) { case 0: /* Volume Status */ /* Modify Volume Status */ bsendmsg(ua, _("Current Volume status is: %s\n"), mr.VolStatus); @@ -689,19 +896,10 @@ static int update_volume(UAContext *ua) add_prompt(ua, "Recycle"); } add_prompt(ua, "Read-Only"); - if (do_prompt(ua, _("Choose new Volume Status"), ua->cmd, sizeof(mr.VolStatus)) < 0) { + if (do_prompt(ua, "", _("Choose new Volume Status"), ua->cmd, sizeof(mr.VolStatus)) < 0) { return 1; } - bstrncpy(mr.VolStatus, ua->cmd, sizeof(mr.VolStatus)); - query = get_pool_memory(PM_MESSAGE); - 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); + update_volstatus(ua, ua->cmd, &mr); break; case 1: /* Retention */ bsendmsg(ua, _("Current retention seconds is: %s\n"), @@ -709,20 +907,7 @@ static int update_volume(UAContext *ua) if (!get_cmd(ua, _("Enter Volume Retention period: "))) { return 0; } - 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=%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); + update_volretention(ua, ua->cmd, &mr); break; case 2: /* Use Duration */ @@ -731,103 +916,45 @@ static int update_volume(UAContext *ua) 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); + update_voluseduration(ua, ua->cmd, &mr); break; 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); + update_volmaxjobs(ua, ua->cmd, &mr); 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; } - 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, _("New max files is: %u\n"), maxfiles); - } - free_pool_memory(query); + update_volmaxfiles(ua, ua->cmd, &mr); 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); + update_volmaxbytes(ua, ua->cmd, &mr); 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=%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); + update_volrecycle(ua, ua->cmd, &mr); break; case 7: /* Slot */ - int slot; - POOL_DBR pr; + int Slot; memset(&pr, 0, sizeof(POOL_DBR)); pr.PoolId = mr.PoolId; @@ -839,24 +966,43 @@ static int update_volume(UAContext *ua) 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); } - free_pool_memory(query); break; - case 8: /* Volume Files */ + 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: %d\n"), mr.InChanger); + } + break; + + + 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")); @@ -882,6 +1028,20 @@ static int update_volume(UAContext *ua) 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; @@ -900,7 +1060,6 @@ static int update_pool(UAContext *ua) POOL *pool; POOLMEM *query; - pool = get_pool_resource(ua); if (!pool) { return 0; @@ -912,7 +1071,7 @@ static int update_pool(UAContext *ua) return 0; } - set_pooldbr_from_poolres(&pr, pool, 0); /* update */ + set_pooldbr_from_poolres(&pr, pool, POOL_OP_UPDATE); /* update */ id = db_update_pool_record(ua->jcr, ua->db, &pr); if (id <= 0) { @@ -921,7 +1080,7 @@ static int update_pool(UAContext *ua) } 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); + 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")); return 1; @@ -975,7 +1134,6 @@ static void do_client_setdebug(UAContext *ua, CLIENT *client, int level) bnet_sig(fd, BNET_TERMINATE); bnet_close(fd); ua->jcr->file_bsock = NULL; - return; } @@ -1057,7 +1215,7 @@ static void do_all_setdebug(UAContext *ua, int level) /* * setdebug level=nn all */ -static int setdebugcmd(UAContext *ua, char *cmd) +static int setdebug_cmd(UAContext *ua, char *cmd) { STORE *store; CLIENT *client; @@ -1092,7 +1250,8 @@ static int setdebugcmd(UAContext *ua, char *cmd) 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]); @@ -1109,7 +1268,8 @@ static int setdebugcmd(UAContext *ua, char *cmd) } 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]); @@ -1134,35 +1294,149 @@ static int setdebugcmd(UAContext *ua, char *cmd) add_prompt(ua, _("Storage")); add_prompt(ua, _("Client")); add_prompt(ua, _("All")); - 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, 0); - if (store) { - do_storage_setdebug(ua, store, level); + 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, 0); + if (store) { + do_storage_setdebug(ua, store, level); + } + break; + case 2: + client = select_client_resource(ua); + if (client) { + do_client_setdebug(ua, client, level); + } + break; + case 3: + do_all_setdebug(ua, level); + break; + default: + break; + } + return 1; +} + +static int var_cmd(UAContext *ua, char *cmd) +{ + POOLMEM *val = get_pool_memory(PM_FNAME); + char *var; + + if (!open_db(ua)) { + return 1; + } + for (var=ua->cmd; *var != ' '; ) { /* skip command */ + var++; + } + while (*var == ' ') { /* skip spaces */ + var++; + } + Dmsg1(100, "Var=%s:\n", var); + variable_expansion(ua->jcr, var, &val); + bsendmsg(ua, "%s\n", val); + free_pool_memory(val); + return 1; +} + +static int estimate_cmd(UAContext *ua, char *cmd) +{ + JOB *job = NULL; + CLIENT *client = NULL; + FILESET *fileset = NULL; + int listing = 0; + BSOCK *fd; + char since[MAXSTRING]; + + for (int i=1; iargc; i++) { + 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; } - break; - case 2: - client = select_client_resource(ua); - if (client) { - do_client_setdebug(ua, client, level); + } + if (strcasecmp(ua->argk[i], _("job")) == 0) { + if (ua->argv[i]) { + job = (JOB *)GetResWithName(R_JOB, ua->argv[i]); + continue; } - break; - case 3: - do_all_setdebug(ua, level); - break; - default: - break; + } + if (strcasecmp(ua->argk[i], _("fileset")) == 0) { + if (ua->argv[i]) { + fileset = (FILESET *)GetResWithName(R_FILESET, ua->argv[i]); + continue; + } + } + if (strcasecmp(ua->argk[i], _("listing")) == 0) { + listing = 1; + } + } + if (!job && !(client && fileset)) { + if (!(job = select_job_resource(ua))) { + return 1; + } + } + if (!job) { + job = (JOB *)GetResWithName(R_JOB, ua->argk[1]); + } + if (!client) { + client = job->client; + } + if (!fileset) { + fileset = job->fileset; + } + ua->jcr->client = client; + ua->jcr->fileset = fileset; + close_db(ua); + ua->catalog = client->catalog; + + if (!open_db(ua)) { + 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)) { + bsendmsg(ua, _("Failed to connect to Client.\n")); + return 1; + } + fd = ua->jcr->file_bsock; + + if (!send_include_list(ua->jcr)) { + bsendmsg(ua, _("Error sending include list.\n")); + return 1; + } + + if (!send_exclude_list(ua->jcr)) { + bsendmsg(ua, _("Error sending exclude list.\n")); + return 1; + } + + if (!send_level_command(ua->jcr)) { + return 1; + } + + bnet_fsend(fd, "estimate listing=%d\n", listing); + while (bnet_recv(fd) >= 0) { + bsendmsg(ua, "%s", fd->msg); } + + bnet_sig(fd, BNET_TERMINATE); + bnet_close(fd); + ua->jcr->file_bsock = NULL; + return 1; } + /* * print time */ -static int timecmd(UAContext *ua, char *cmd) +static int time_cmd(UAContext *ua, char *cmd) { char sdt[50]; time_t ttime = time(NULL); @@ -1181,45 +1455,78 @@ static int timecmd(UAContext *ua, char *cmd) * delete pool= * delete media pool= volume= */ -static int deletecmd(UAContext *ua, char *cmd) +static int delete_cmd(UAContext *ua, char *cmd) { 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: - delete_volume(ua); - return 1; - case 1: - delete_pool(ua); - return 1; - default: - break; + case 0: + delete_volume(ua); + return 1; + 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); - break; - case 1: - delete_pool(ua); - break; - default: - bsendmsg(ua, _("Nothing done.\n")); - break; + case 0: + delete_volume(ua); + break; + 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 */ @@ -1265,7 +1572,7 @@ static int delete_pool(UAContext *ua) } -static void do_mount_cmd(int mount, UAContext *ua, char *cmd) +static void do_mount_cmd(UAContext *ua, char *command) { STORE *store; BSOCK *sd; @@ -1275,7 +1582,7 @@ static void do_mount_cmd(int mount, UAContext *ua, char *cmd) if (!open_db(ua)) { return; } - Dmsg1(120, "mount: %s\n", ua->UA_sock->msg); + Dmsg2(120, "%s: %s\n", command, ua->UA_sock->msg); store = get_storage_resource(ua, 1); if (!store) { @@ -1293,16 +1600,9 @@ static void do_mount_cmd(int mount, UAContext *ua, char *cmd) sd = ua->jcr->store_bsock; strcpy(dev_name, store->dev_name); bash_spaces(dev_name); - if (mount) { - bnet_fsend(sd, "mount %s", dev_name); - } else { - bnet_fsend(sd, "unmount %s", dev_name); - } + bnet_fsend(sd, "%s %s", command, dev_name); while (bnet_recv(sd) >= 0) { bsendmsg(ua, "%s", sd->msg); - if (strncmp(sd->msg, "3001 OK mount.", 14) == 0) { - /***** ****FIXME**** fix JobStatus */ - } } bnet_sig(sd, BNET_TERMINATE); bnet_close(sd); @@ -1312,9 +1612,9 @@ static void do_mount_cmd(int mount, UAContext *ua, char *cmd) /* * mount [storage | device] */ -static int mountcmd(UAContext *ua, char *cmd) +static int mount_cmd(UAContext *ua, char *cmd) { - do_mount_cmd(1, ua, cmd); /* mount */ + do_mount_cmd(ua, "mount"); /* mount */ return 1; } @@ -1322,9 +1622,19 @@ static int mountcmd(UAContext *ua, char *cmd) /* * unmount [storage | device] */ -static int unmountcmd(UAContext *ua, char *cmd) +static int unmount_cmd(UAContext *ua, char *cmd) { - do_mount_cmd(0, ua, cmd); /* unmount */ + do_mount_cmd(ua, "unmount"); /* unmount */ + return 1; +} + + +/* + * release [storage | device] + */ +static int release_cmd(UAContext *ua, char *cmd) +{ + do_mount_cmd(ua, "release"); /* release */ return 1; } @@ -1333,7 +1643,7 @@ static int unmountcmd(UAContext *ua, char *cmd) * Switch databases * use catalog= */ -static int usecmd(UAContext *ua, char *cmd) +static int use_cmd(UAContext *ua, char *cmd) { CAT *oldcatalog, *catalog; @@ -1353,7 +1663,7 @@ static int usecmd(UAContext *ua, char *cmd) return 1; } -int quitcmd(UAContext *ua, char *cmd) +int quit_cmd(UAContext *ua, char *cmd) { ua->quit = TRUE; return 1; @@ -1362,15 +1672,16 @@ int quitcmd(UAContext *ua, char *cmd) /* * Wait until no job is running */ -int waitcmd(UAContext *ua, char *cmd) +int wait_cmd(UAContext *ua, 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; } @@ -1385,20 +1696,19 @@ int waitcmd(UAContext *ua, char *cmd) } -static int helpcmd(UAContext *ua, char *cmd) +static int help_cmd(UAContext *ua, char *cmd) { unsigned int i; -/* usage(); */ bsendmsg(ua, _(" Command Description\n ======= ===========\n")); for (i=0; ijcr->catalog = ua->catalog; + Dmsg0(150, "Open database\n"); 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)); + if (!ua->db || !db_open_database(ua->jcr, ua->db)) { + bsendmsg(ua, _("Could not open database \"%s\".\n"), + ua->catalog->db_name); + if (ua->db) { + bsendmsg(ua, "%s", db_strerror(ua->db)); + } close_db(ua); return 0; } @@ -1446,7 +1761,9 @@ void close_db(UAContext *ua) { if (ua->db) { db_close_database(ua->jcr, ua->db); + ua->db = NULL; + if (ua->jcr) { + ua->jcr->db = NULL; + } } - ua->db = NULL; - ua->jcr->db = NULL; }