X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_cmds.c;h=471315ed06c6fb41854704a90a9af1b052ebdb20;hb=f183afa93772e5f5b3951407bce839b951dede96;hp=7ea798769fdcf0dafc74afbaa7cc900d08b81b1a;hpb=741618418f0d9971ce14fe9d6496acb0c7f8c490;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c index 7ea798769f..471315ed06 100644 --- a/bacula/src/dird/ua_cmds.c +++ b/bacula/src/dird/ua_cmds.c @@ -6,24 +6,18 @@ * * Version $Id$ */ - /* - Copyright (C) 2000-2004 Kern Sibbald and John Walker + Copyright (C) 2000-2005 Kern Sibbald This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + modify it under the terms of the GNU General Public License + version 2 as ammended with additional clauses defined in the + file LICENSE in the main source directory. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + the file LICENSE for additional details. */ @@ -37,11 +31,9 @@ extern int r_first; extern int r_last; extern struct s_res resources[]; extern char my_name[]; -extern jobq_t job_queue; /* job queue */ +extern jobq_t job_queue; /* job queue */ -extern char *list_pool; - /* Imported functions */ extern int status_cmd(UAContext *ua, const char *cmd); extern int list_cmd(UAContext *ua, const char *cmd); @@ -52,19 +44,18 @@ 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 */ +extern int update_cmd(UAContext *ua, const char *cmd); /* Forward referenced functions */ -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 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); @@ -77,16 +68,14 @@ 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 void delete_job(UAContext *ua); 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); +static int python_cmd(UAContext *ua, const char *cmd); static void do_job_delete(UAContext *ua, JobId_t JobId); static void delete_job_id_range(UAContext *ua, char *tok); @@ -94,25 +83,26 @@ int qhelp_cmd(UAContext *ua, const char *cmd); int quit_cmd(UAContext *ua, const char *cmd); -struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const 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"), 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= | media volume=]")}, + { N_("autodisplay"), autodisplay_cmd, _("autodisplay [on|off] -- console messages")}, + { N_("automount"), automount_cmd, _("automount [on|off] -- after label")}, + { N_("cancel"), cancel_cmd, _("cancel [ | ] -- 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_("gui"), gui_cmd, _("gui [on/off] -- non-interactive gui mode")}, + { 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 | files jobid=]; from catalog")}, + { N_("list"), list_cmd, _("list [pools | jobs | jobtotals | media | files ]; 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_("python"), python_cmd, _("python control commands")}, { N_("quit"), quit_cmd, _("quit")}, { N_("query"), querycmd, _("query catalog")}, { N_("restore"), restore_cmd, _("restore files")}, @@ -124,16 +114,17 @@ static struct cmdstruct commands[] = { { 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_("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 ")}, - { N_("update"), update_cmd, _("update Volume or Pool")}, + { N_("umount"), unmount_cmd, _("umount for old-time Unix guys")}, + { N_("update"), update_cmd, _("update Volume, Pool or slots")}, { 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)) /* @@ -147,20 +138,20 @@ int do_a_command(UAContext *ua, const char *cmd) stat = 1; - Dmsg1(200, "Command: %s\n", ua->UA_sock->msg); + Dmsg1(900, "Command: %s\n", ua->UA_sock->msg); if (ua->argc == 0) { return 1; } 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 = true; - break; + if (!acl_access_ok(ua, Command_ACL, ua->argk[0], len)) { + break; + } + stat = (*commands[i].func)(ua, cmd); /* go execute command */ + found = true; + break; } } if (!found) { @@ -171,7 +162,7 @@ int do_a_command(UAContext *ua, const char *cmd) /* * This is a common routine used to stuff the Pool DB record defaults - * into the Media DB record just before creating a media (Volume) + * 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) @@ -184,13 +175,14 @@ void set_pool_dbr_defaults_in_media_dbr(MEDIA_DBR *mr, POOL_DBR *pr) mr->MaxVolJobs = pr->MaxVolJobs; mr->MaxVolFiles = pr->MaxVolFiles; mr->MaxVolBytes = pr->MaxVolBytes; + mr->LabelType = pr->LabelType; } /* * Add Volumes to an existing Pool */ -static int add_cmd(UAContext *ua, const char *cmd) +static int add_cmd(UAContext *ua, const char *cmd) { POOL_DBR pr; MEDIA_DBR mr; @@ -223,9 +215,9 @@ static int add_cmd(UAContext *ua, const char *cmd) bsendmsg(ua, _("Pool already has maximum volumes = %d\n"), pr.MaxVols); for (;;) { if (!get_pint(ua, _("Enter new maximum (zero for unlimited): "))) { - return 1; - } - pr.MaxVols = ua->pint32_val; + return 1; + } + pr.MaxVols = ua->pint32_val; } } @@ -235,33 +227,33 @@ static int add_cmd(UAContext *ua, const char *cmd) } else if (!get_media_type(ua, mr.MediaType, sizeof(mr.MediaType))) { return 1; } - + if (pr.MaxVols == 0) { max = 1000; } else { max = pr.MaxVols - pr.NumVols; } for (;;) { - char buf[100]; + char buf[100]; bsnprintf(buf, sizeof(buf), _("Enter number of Volumes to create. 0=>fixed name. Max=%d: "), max); if (!get_pint(ua, buf)) { - return 1; + return 1; } num = ua->pint32_val; if (num < 0 || num > max) { bsendmsg(ua, _("The number must be between 0 and %d\n"), max); - continue; + continue; } break; } getVolName: if (num == 0) { if (!get_cmd(ua, _("Enter Volume name: "))) { - return 1; + return 1; } } else { if (!get_cmd(ua, _("Enter base volume name: "))) { - return 1; + return 1; } } /* Don't allow | in Volume name because it is the volume separator character */ @@ -279,18 +271,18 @@ getVolName: bstrncpy(name, ua->cmd, sizeof(name)); if (num > 0) { - strcat(name, "%04d"); + bstrncat(name, "%04d", sizeof(name)); for (;;) { if (!get_pint(ua, _("Enter the starting number: "))) { - return 1; - } - startnum = ua->pint32_val; - if (startnum < 1) { + return 1; + } + startnum = ua->pint32_val; + if (startnum < 1) { bsendmsg(ua, _("Start number must be greater than zero.\n")); - continue; - } - break; + continue; + } + break; } } else { startnum = 1; @@ -299,31 +291,32 @@ getVolName: if (store && store->autochanger) { if (!get_pint(ua, _("Enter slot (0 for none): "))) { - return 1; + return 1; } Slot = ua->pint32_val; if (!get_yesno(ua, _("InChanger? yes/no: "))) { - return 1; + return 1; } InChanger = ua->pint32_val; } - + set_pool_dbr_defaults_in_media_dbr(&mr, &pr); - for (i=startnum; i < num+startnum; i++) { + for (i=startnum; i < num+startnum; i++) { bsnprintf(mr.VolumeName, sizeof(mr.VolumeName), name, i); mr.Slot = Slot++; mr.InChanger = InChanger; + mr.StorageId = store->StorageId; Dmsg1(200, "Create Volume %s\n", mr.VolumeName); if (!db_create_media_record(ua->jcr, ua->db, &mr)) { bsendmsg(ua, "%s", db_strerror(ua->db)); - return 1; + return 1; } if (i == startnum) { - first_id = mr.PoolId; + first_id = mr.PoolId; } } pr.NumVols += num; - Dmsg0(200, "Update pool record.\n"); + Dmsg0(200, "Update pool record.\n"); if (db_update_pool_record(ua->jcr, ua->db, &pr) != 1) { bsendmsg(ua, "%s", db_strerror(ua->db)); return 1; @@ -334,9 +327,9 @@ getVolName: } /* - * Turn auto mount on/off - * - * automount on + * Turn auto mount on/off + * + * automount on * automount off */ int automount_cmd(UAContext *ua, const char *cmd) @@ -345,7 +338,7 @@ int automount_cmd(UAContext *ua, const char *cmd) if (ua->argc != 2) { if (!get_cmd(ua, _("Turn on or off? "))) { - return 1; + return 1; } onoff = ua->cmd; } else { @@ -353,7 +346,7 @@ int automount_cmd(UAContext *ua, const char *cmd) } ua->automount = (strcasecmp(onoff, _("off")) == 0) ? 0 : 1; - return 1; + return 1; } @@ -373,72 +366,71 @@ static int cancel_cmd(UAContext *ua, const char *cmd) for (i=1; iargc; i++) { if (strcasecmp(ua->argk[i], _("jobid")) == 0) { - uint32_t JobId; - if (!ua->argv[i]) { - break; - } - JobId = str_to_int64(ua->argv[i]); - if (!(jcr=get_jcr_by_id(JobId))) { + uint32_t JobId; + if (!ua->argv[i]) { + break; + } + 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; + return 1; + } + break; } else if (strcasecmp(ua->argk[i], _("job")) == 0) { - if (!ua->argv[i]) { - break; - } - if (!(jcr=get_jcr_by_partial_name(ua->argv[i]))) { + if (!ua->argv[i]) { + break; + } + if (!(jcr=get_jcr_by_partial_name(ua->argv[i]))) { bsendmsg(ua, _("Job %s is not running.\n"), ua->argv[i]); - return 1; - } - break; + return 1; + } + break; } } /* If we still do not have a jcr, - * throw up a list and ask the user to select one. + * throw up a list and ask the user to select one. */ if (!jcr) { + char buf[1000]; /* Count Jobs running */ - lock_jcr_chain(); foreach_jcr(jcr) { - if (jcr->JobId == 0) { /* this is us */ - free_locked_jcr(jcr); - continue; - } - free_locked_jcr(jcr); - njobs++; + if (jcr->JobId == 0) { /* this is us */ + free_jcr(jcr); + continue; + } + free_jcr(jcr); + njobs++; } - unlock_jcr_chain(); if (njobs == 0) { bsendmsg(ua, _("No Jobs running.\n")); - return 1; + return 1; } start_prompt(ua, _("Select Job:\n")); - lock_jcr_chain(); foreach_jcr(jcr) { - if (jcr->JobId == 0) { /* this is us */ - free_locked_jcr(jcr); - continue; - } - add_prompt(ua, jcr->Job); - free_locked_jcr(jcr); + if (jcr->JobId == 0) { /* this is us */ + free_jcr(jcr); + continue; + } + bsnprintf(buf, sizeof(buf), "JobId=%d Job=%s", jcr->JobId, jcr->Job); + add_prompt(ua, buf); + free_jcr(jcr); } - unlock_jcr_chain(); - if (do_prompt(ua, _("Job"), _("Choose Job to cancel"), JobName, sizeof(JobName)) < 0) { - return 1; + if (do_prompt(ua, _("Job"), _("Choose Job to cancel"), buf, sizeof(buf)) < 0) { + return 1; } if (njobs == 1) { if (!get_yesno(ua, _("Confirm cancel (yes/no): ")) || ua->pint32_val == 0) { - return 1; - } + return 1; + } } /* NOTE! This increments the ref_count */ + sscanf(buf, "JobId=%d Job=%127s", &njobs, JobName); jcr = get_jcr_by_full_name(JobName); if (!jcr) { bsendmsg(ua, _("Job %s not found.\n"), JobName); - return 1; + return 1; } } @@ -455,20 +447,21 @@ static int cancel_cmd(UAContext *ua, const char *cmd) * depending on if we are creating the Pool or we are * simply bringing it into agreement with the resource (updage). */ -static void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op) +void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op) { - strcpy(pr->PoolType, pool->pool_type); + bstrncpy(pr->PoolType, pool->pool_type, sizeof(pr->PoolType)); if (op == POOL_OP_CREATE) { pr->MaxVols = pool->max_volumes; pr->NumVols = 0; - } else { /* update pool */ + } else { /* update pool */ if (pr->MaxVols != pool->max_volumes) { - pr->MaxVols = pool->max_volumes; + pr->MaxVols = pool->max_volumes; } if (pr->MaxVols != 0 && pr->MaxVols < pr->NumVols) { - pr->MaxVols = pr->NumVols; + pr->MaxVols = pr->NumVols; } } + pr->LabelType = pool->LabelType; pr->UseOnce = pool->use_volume_once; pr->UseCatalog = pool->use_catalog; pr->AcceptAnyVolume = pool->accept_any_volume; @@ -481,9 +474,9 @@ static void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op) pr->AutoPrune = pool->AutoPrune; pr->Recycle = pool->Recycle; if (pool->label_format) { - strcpy(pr->LabelFormat, pool->label_format); + bstrncpy(pr->LabelFormat, pool->label_format, sizeof(pr->LabelFormat)); } else { - strcpy(pr->LabelFormat, "*"); /* none */ + bstrncpy(pr->LabelFormat, "*", sizeof(pr->LabelFormat)); /* none */ } } @@ -491,9 +484,9 @@ static void set_pooldbr_from_poolres(POOL_DBR *pr, POOL *pool, e_pool_op op) /* * Create a pool record from a given Pool resource * Also called from backup.c - * Returns: -1 on error - * 0 record already exists - * 1 record created + * Returns: -1 on error + * 0 record already exists + * 1 record created */ int create_pool(JCR *jcr, B_DB *db, POOL *pool, e_pool_op op) @@ -502,21 +495,21 @@ int create_pool(JCR *jcr, B_DB *db, POOL *pool, e_pool_op op) memset(&pr, 0, sizeof(POOL_DBR)); - strcpy(pr.Name, pool->hdr.name); + bstrncpy(pr.Name, pool->hdr.name, sizeof(pr.Name)); if (db_get_pool_record(jcr, db, &pr)) { /* Pool Exists */ if (op == POOL_OP_UPDATE) { /* update request */ - set_pooldbr_from_poolres(&pr, pool, op); - db_update_pool_record(jcr, db, &pr); + set_pooldbr_from_poolres(&pr, pool, op); + db_update_pool_record(jcr, db, &pr); } - return 0; /* exists */ + return 0; /* exists */ } set_pooldbr_from_poolres(&pr, pool, op); if (!db_create_pool_record(jcr, db, &pr)) { - return -1; /* error */ + return -1; /* error */ } return 1; } @@ -527,7 +520,7 @@ int create_pool(JCR *jcr, B_DB *db, POOL *pool, e_pool_op op) * Create a Pool Record in the database. * It is always created from the Resource record. */ -static int create_cmd(UAContext *ua, const char *cmd) +static int create_cmd(UAContext *ua, const char *cmd) { POOL *pool; @@ -558,15 +551,35 @@ static int create_cmd(UAContext *ua, const char *cmd) } +extern DIRRES *director; + +/* + * Python control command + * python restart (restarts interpreter) + */ +static int python_cmd(UAContext *ua, const char *cmd) +{ + if (strcasecmp(ua->argk[1], _("restart")) == 0) { + term_python_interpreter(); + init_python_interpreter(director->hdr.name, + director->scripts_directory, "DirStartUp"); + bsendmsg(ua, _("Python interpreter restarted.\n")); + } else { + bsendmsg(ua, _("Nothing done.\n")); + } + return 1; +} + + /* * Set a new address in a Client resource. We do this only - * if the Console name is the same as the Client name + * 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) +static int setip_cmd(UAContext *ua, const char *cmd) { CLIENT *client; - char buf[1024]; + 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; @@ -582,634 +595,41 @@ static int setip_cmd(UAContext *ua, const char *cmd) free(client->address); } /* MA Bug 6 remove ifdef */ - sockaddr_to_ascii(&(ua->UA_sock->client_addr), buf, sizeof(buf)); + 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); + client->hdr.name, client->address); get_out: UnlockRes(); return 1; } -/* - * Update a Pool Record in the database. - * It is always updated from the Resource record. - * - * update pool= - * updates pool from Pool resource - * update media pool= volume= - * changes pool info for volume - * update slots [scan=...] - * updates autochanger slots - */ -static int update_cmd(UAContext *ua, const char *cmd) -{ - static const char *kw[] = { - N_("media"), /* 0 */ - N_("volume"), /* 1 */ - N_("pool"), /* 2 */ - N_("slots"), /* 3 */ - NULL}; - - if (!open_db(ua)) { - return 1; - } - - 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; - } - - 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, _("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, const char *val, MEDIA_DBR *mr) -{ - POOLMEM *query = get_pool_memory(PM_MESSAGE); - const 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[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", - 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 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[150]; - 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, 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", - 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_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)); - if (!get_pool_dbr(ua, &pr)) { - return; - } - mr->PoolId = pr.PoolId; /* set new PoolId */ - /* - */ - 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 - * writing on the volume, set it to anything other - * than Append. - */ -static int update_volume(UAContext *ua) -{ - MEDIA_DBR mr; - POOL_DBR pr; - POOLMEM *query; - char ed1[130]; - bool done = false; - const 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 */ - 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 (i != 9 && !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: - 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; - } - } - - for ( ; !done; ) { - if (!select_media_dbr(ua, &mr)) { - return 0; - } - 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, _("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 */ - /* Modify Volume Status */ - bsendmsg(ua, _("Current Volume status is: %s\n"), mr.VolStatus); - start_prompt(ua, _("Possible Values are:\n")); - 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, sizeof(mr.VolStatus)) < 0) { - return 1; - } - update_volstatus(ua, ua->cmd, &mr); - break; - case 1: /* Retention */ - 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; - } - update_volretention(ua, ua->cmd, &mr); - break; - - case 2: /* Use Duration */ - bsendmsg(ua, _("Current use duration is: %s\n"), - edit_utime(mr.VolUseDuration, ed1, sizeof(ed1))); - if (!get_cmd(ua, _("Enter Volume Use Duration: "))) { - return 0; - } - update_voluseduration(ua, ua->cmd, &mr); - break; - - case 3: /* Max Jobs */ - bsendmsg(ua, _("Current max jobs is: %u\n"), mr.MaxVolJobs); - if (!get_pint(ua, _("Enter new Maximum Jobs: "))) { - return 0; - } - update_volmaxjobs(ua, ua->cmd, &mr); - break; - - case 4: /* Max Files */ - bsendmsg(ua, _("Current max files is: %u\n"), mr.MaxVolFiles); - if (!get_pint(ua, _("Enter new Maximum Files: "))) { - return 0; - } - update_volmaxfiles(ua, ua->cmd, &mr); - break; - - case 5: /* Max Bytes */ - bsendmsg(ua, _("Current value is: %s\n"), edit_uint64(mr.MaxVolBytes, ed1)); - if (!get_cmd(ua, _("Enter new Maximum Bytes: "))) { - return 0; - } - update_volmaxbytes(ua, ua->cmd, &mr); - break; - - - case 6: /* Recycle */ - bsendmsg(ua, _("Current recycle flag is: %s\n"), - mr.Recycle==1?_("yes"):_("no")); - if (!get_yesno(ua, _("Enter new Recycle status: "))) { - return 0; - } - update_volrecycle(ua, ua->cmd, &mr); - break; - - case 7: /* Slot */ - int Slot; - - 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 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; - } - 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"), mr.Slot); - } - break; - - case 8: /* InChanger */ - bsendmsg(ua, _("Current InChanger flag is: %d\n"), mr.InChanger); - if (!get_yesno(ua, _("Set InChanger flag? yes/no: "))) { - return 0; - } - mr.InChanger = ua->pint32_val; - /* - * Make sure to use db_update... rather than doing this directly, - * so that any Slot is handled correctly. - */ - if (!db_update_media_record(ua->jcr, ua->db, &mr)) { - bsendmsg(ua, _("Error updating media record Slot: ERR=%s"), db_strerror(ua->db)); - } else { - bsendmsg(ua, _("New InChanger flag is: %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")); - 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; - - 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_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; - } - } - return 1; -} - -/* - * Update pool record -- pull info from current POOL resource - */ -static int update_pool(UAContext *ua) -{ - POOL_DBR pr; - int id; - POOL *pool; - POOLMEM *query; - - pool = get_pool_resource(ua); - if (!pool) { - return 0; - } - - memset(&pr, 0, sizeof(pr)); - strcpy(pr.Name, pool->hdr.name); - if (!get_pool_dbr(ua, &pr)) { - return 0; - } - - set_pooldbr_from_poolres(&pr, pool, POOL_OP_UPDATE); /* 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, HORZ_LIST); - free_pool_memory(query); - bsendmsg(ua, _("Pool DB record updated from resource.\n")); - return 1; -} - - static void do_storage_setdebug(UAContext *ua, STORE *store, int level, int trace_flag) { BSOCK *sd; + JCR *jcr = ua->jcr; - ua->jcr->store = store; + set_storage(jcr, store); /* Try connecting for up to 15 seconds */ - bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d\n"), + 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, 1, 15, 0)) { + if (!connect_to_storage_daemon(jcr, 1, 15, 0)) { bsendmsg(ua, _("Failed to connect to Storage daemon.\n")); return; } Dmsg0(120, _("Connected to storage daemon\n")); - sd = ua->jcr->store_bsock; + sd = jcr->store_bsock; bnet_fsend(sd, "setdebug=%d trace=%d\n", level, trace_flag); if (bnet_recv(sd) >= 0) { bsendmsg(ua, "%s", sd->msg); } bnet_sig(sd, BNET_TERMINATE); bnet_close(sd); - ua->jcr->store_bsock = NULL; - return; + jcr->store_bsock = NULL; + return; } - + static void do_client_setdebug(UAContext *ua, CLIENT *client, int level, int trace_flag) { BSOCK *fd; @@ -1218,7 +638,7 @@ static void do_client_setdebug(UAContext *ua, CLIENT *client, int level, int tra ua->jcr->client = client; /* Try to connect for 15 seconds */ - bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"), + bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"), client->hdr.name, client->address, client->FDport); if (!connect_to_file_daemon(ua->jcr, 1, 15, 0)) { bsendmsg(ua, _("Failed to connect to Client.\n")); @@ -1233,7 +653,7 @@ static void do_client_setdebug(UAContext *ua, CLIENT *client, int level, int tra bnet_sig(fd, BNET_TERMINATE); bnet_close(fd); ua->jcr->file_bsock = NULL; - return; + return; } @@ -1249,24 +669,26 @@ static void do_all_setdebug(UAContext *ua, int level, int trace_flag) /* Count Storage items */ LockRes(); store = NULL; - for (i=0; (store = (STORE *)GetNextRes(R_STORAGE, (RES *)store)); i++) - { } + i = 0; + foreach_res(store, R_STORAGE) { + i++; + } unique_store = (STORE **) malloc(i * sizeof(STORE)); - /* Find Unique Storage address/port */ + /* Find Unique Storage address/port */ store = (STORE *)GetNextRes(R_STORAGE, NULL); i = 0; unique_store[i++] = store; while ((store = (STORE *)GetNextRes(R_STORAGE, (RES *)store))) { found = 0; for (j=0; jaddress, store->address) == 0 && - unique_store[j]->SDport == store->SDport) { - found = 1; - break; - } + if (strcmp(unique_store[j]->address, store->address) == 0 && + unique_store[j]->SDport == store->SDport) { + found = 1; + break; + } } if (!found) { - unique_store[i++] = store; + unique_store[i++] = store; Dmsg2(140, "Stuffing: %s:%d\n", store->address, store->SDport); } } @@ -1281,24 +703,26 @@ static void do_all_setdebug(UAContext *ua, int level, int trace_flag) /* Count Client items */ LockRes(); client = NULL; - for (i=0; (client = (CLIENT *)GetNextRes(R_CLIENT, (RES *)client)); i++) - { } + i = 0; + foreach_res(client, R_CLIENT) { + i++; + } unique_client = (CLIENT **) malloc(i * sizeof(CLIENT)); - /* Find Unique Client address/port */ + /* Find Unique Client address/port */ client = (CLIENT *)GetNextRes(R_CLIENT, NULL); i = 0; unique_client[i++] = client; while ((client = (CLIENT *)GetNextRes(R_CLIENT, (RES *)client))) { found = 0; for (j=0; jaddress, client->address) == 0 && - unique_client[j]->FDport == client->FDport) { - found = 1; - break; - } + if (strcmp(unique_client[j]->address, client->address) == 0 && + unique_client[j]->FDport == client->FDport) { + found = 1; + break; + } } if (!found) { - unique_client[i++] = client; + unique_client[i++] = client; Dmsg2(140, "Stuffing: %s:%d\n", client->address, client->FDport); } } @@ -1334,7 +758,7 @@ static int setdebug_cmd(UAContext *ua, const char *cmd) } if (level < 0) { if (!get_pint(ua, _("Enter new debug level: "))) { - return 1; + return 1; } level = ua->pint32_val; } @@ -1344,57 +768,57 @@ static int setdebug_cmd(UAContext *ua, const char *cmd) if (i >= 0) { trace_flag = atoi(ua->argv[i]); if (trace_flag > 0) { - trace_flag = 1; + trace_flag = 1; } } /* General debug? */ for (i=1; iargc; i++) { if (strcasecmp(ua->argk[i], _("all")) == 0) { - do_all_setdebug(ua, level, trace_flag); - return 1; + 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; + debug_level = level; + set_trace(trace_flag); + return 1; } if (strcasecmp(ua->argk[i], _("client")) == 0 || strcasecmp(ua->argk[i], _("fd")) == 0) { - client = NULL; - if (ua->argv[i]) { - client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]); - if (client) { - do_client_setdebug(ua, client, level, trace_flag); - return 1; - } - } - client = select_client_resource(ua); - if (client) { - do_client_setdebug(ua, client, level, trace_flag); - return 1; - } + client = NULL; + if (ua->argv[i]) { + client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]); + if (client) { + do_client_setdebug(ua, client, level, trace_flag); + return 1; + } + } + client = select_client_resource(ua); + if (client) { + do_client_setdebug(ua, client, level, trace_flag); + return 1; + } } if (strcasecmp(ua->argk[i], _("store")) == 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]); - if (store) { - do_storage_setdebug(ua, store, level, trace_flag); - return 1; - } - } - store = get_storage_resource(ua, 0); - if (store) { - do_storage_setdebug(ua, store, level, trace_flag); - return 1; - } + store = NULL; + if (ua->argv[i]) { + store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]); + if (store) { + do_storage_setdebug(ua, store, level, trace_flag); + return 1; + } + } + store = get_storage_resource(ua, 0); + if (store) { + do_storage_setdebug(ua, store, level, trace_flag); + return 1; + } } - } + } /* * We didn't find an appropriate keyword above, so * prompt the user. @@ -1405,20 +829,20 @@ static int setdebug_cmd(UAContext *ua, const char *cmd) add_prompt(ua, _("Client")); add_prompt(ua, _("All")); switch(do_prompt(ua, "", _("Select daemon type to set debug level"), NULL, 0)) { - case 0: /* Director */ + 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, trace_flag); + do_storage_setdebug(ua, store, level, trace_flag); } break; case 2: client = select_client_resource(ua); if (client) { - do_client_setdebug(ua, client, level, trace_flag); + do_client_setdebug(ua, client, level, trace_flag); } break; case 3: @@ -1439,7 +863,7 @@ static int trace_cmd(UAContext *ua, const char *cmd) if (ua->argc != 2) { if (!get_cmd(ua, _("Turn on or off? "))) { - return 1; + return 1; } onoff = ua->cmd; } else { @@ -1447,7 +871,7 @@ static int trace_cmd(UAContext *ua, const char *cmd) } set_trace((strcasecmp(onoff, _("off")) == 0) ? false : true); - return 1; + return 1; } @@ -1466,7 +890,7 @@ static int var_cmd(UAContext *ua, const char *cmd) var++; } Dmsg1(100, "Var=%s:\n", var); - variable_expansion(ua->jcr, var, &val); + variable_expansion(ua->jcr, var, &val); bsendmsg(ua, "%s\n", val); free_pool_memory(val); return 1; @@ -1486,44 +910,44 @@ static int estimate_cmd(UAContext *ua, const char *cmd) 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; - } + if (ua->argv[i]) { + client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]); + continue; + } } if (strcasecmp(ua->argk[i], _("job")) == 0) { - if (ua->argv[i]) { - job = (JOB *)GetResWithName(R_JOB, ua->argv[i]); - continue; - } + if (ua->argv[i]) { + job = (JOB *)GetResWithName(R_JOB, ua->argv[i]); + continue; + } } if (strcasecmp(ua->argk[i], _("fileset")) == 0) { - if (ua->argv[i]) { - fileset = (FILESET *)GetResWithName(R_FILESET, ua->argv[i]); - continue; - } + if (ua->argv[i]) { + fileset = (FILESET *)GetResWithName(R_FILESET, ua->argv[i]); + continue; + } } if (strcasecmp(ua->argk[i], _("listing")) == 0) { - listing = 1; - continue; + listing = 1; + continue; } if (strcasecmp(ua->argk[i], _("level")) == 0) { - if (!get_level_from_name(ua->jcr, ua->argv[i])) { + if (!get_level_from_name(ua->jcr, ua->argv[i])) { bsendmsg(ua, _("Level %s not valid.\n"), ua->argv[i]); - } - continue; + } + continue; } - } + } if (!job && !(client && fileset)) { if (!(job = select_job_resource(ua))) { - return 1; + return 1; } } if (!job) { job = (JOB *)GetResWithName(R_JOB, ua->argk[1]); if (!job) { bsendmsg(ua, _("No job specified.\n")); - return 1; + return 1; } } if (!client) { @@ -1551,7 +975,7 @@ static int estimate_cmd(UAContext *ua, const char *cmd) 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"), @@ -1611,7 +1035,7 @@ extern "C" void reload_config(int sig); static int reload_cmd(UAContext *ua, const char *cmd) { - reload_config(1); + reload_config(1); return 1; } @@ -1620,14 +1044,13 @@ static int reload_cmd(UAContext *ua, const char *cmd) * * delete pool= * delete volume pool= volume= - * delete job jobid=xxx + * delete jobid=xxx */ static int delete_cmd(UAContext *ua, const char *cmd) { static const char *keywords[] = { N_("volume"), N_("pool"), - N_("job"), N_("jobid"), NULL}; @@ -1635,19 +1058,18 @@ static int delete_cmd(UAContext *ua, const char *cmd) return 1; } - switch (find_arg_keyword(ua, keywords)) { + switch (find_arg_keyword(ua, keywords)) { case 0: - delete_volume(ua); + delete_volume(ua); return 1; case 1: delete_pool(ua); return 1; case 2: - case 3: int i; while ((i=find_arg(ua, _("jobid"))) > 0) { - delete_job(ua); - *ua->argk[i] = 0; /* zap keyword already visited */ + delete_job(ua); + *ua->argk[i] = 0; /* zap keyword already visited */ } return 1; default: @@ -1680,7 +1102,7 @@ static int delete_cmd(UAContext *ua, const char *cmd) * delete_job has been modified to parse JobID lists like the * following: * delete job JobID=3,4,6,7-11,14 - * + * * Thanks to Phil Stracchino for the above addition. */ @@ -1692,44 +1114,44 @@ static void delete_job(UAContext *ua) int i = find_arg_with_value(ua, _("jobid")); if (i >= 0) { if (strchr(ua->argv[i], ',') != NULL || strchr(ua->argv[i], '-') != NULL) { - s = bstrdup(ua->argv[i]); - tok = s; - /* + s = bstrdup(ua->argv[i]); + tok = s; + /* * We could use strtok() here. But we're not going to, because: - * (a) strtok() is deprecated, having been replaced by strsep(); - * (b) strtok() is broken in significant ways. + * (a) strtok() is deprecated, having been replaced by strsep(); + * (b) strtok() is broken in significant ways. * we could use strsep() instead, but it's not universally available. - * so we grow our own using strchr(). - */ + * so we grow our own using strchr(). + */ sep = strchr(tok, ','); - while (sep != NULL) { + while (sep != NULL) { *sep = '\0'; if (strchr(tok, '-')) { - delete_job_id_range(ua, tok); - } else { - JobId = str_to_int64(tok); - do_job_delete(ua, JobId); - } - tok = ++sep; + delete_job_id_range(ua, tok); + } else { + JobId = str_to_int64(tok); + do_job_delete(ua, JobId); + } + tok = ++sep; sep = strchr(tok, ','); - } - /* pick up the last token */ + } + /* pick up the last token */ if (strchr(tok, '-')) { - delete_job_id_range(ua, tok); - } else { - JobId = str_to_int64(tok); - do_job_delete(ua, JobId); - } - - free(s); + delete_job_id_range(ua, tok); + } else { + JobId = str_to_int64(tok); + do_job_delete(ua, JobId); + } + + free(s); } else { - JobId = str_to_int64(ua->argv[i]); - do_job_delete(ua, JobId); + JobId = str_to_int64(ua->argv[i]); + do_job_delete(ua, JobId); } } else if (!get_pint(ua, _("Enter JobId to delete: "))) { return; } else { - JobId = ua->pint32_val; + JobId = ua->int64_val; do_job_delete(ua, JobId); } } @@ -1760,19 +1182,20 @@ static void delete_job_id_range(UAContext *ua, char *tok) static void do_job_delete(UAContext *ua, JobId_t JobId) { POOLMEM *query = get_pool_memory(PM_MESSAGE); + char ed1[50]; - Mmsg(query, "DELETE FROM Job WHERE JobId=%u", JobId); + Mmsg(query, "DELETE FROM Job WHERE JobId=%s", edit_int64(JobId, ed1)); 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=%s", edit_int64(JobId, ed1)); 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=%s", edit_int64(JobId, ed1)); 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); + bsendmsg(ua, _("Job %s and associated records deleted from the catalog.\n"), edit_int64(JobId, ed1)); } /* - * Delete media records from database -- dangerous + * Delete media records from database -- dangerous */ static int delete_volume(UAContext *ua) { @@ -1795,12 +1218,12 @@ static int delete_volume(UAContext *ua) } /* - * Delete a pool record from the database -- dangerous + * Delete a pool record from the database -- dangerous */ static int delete_pool(UAContext *ua) { POOL_DBR pr; - + memset(&pr, 0, sizeof(pr)); if (!get_pool_dbr(ua, &pr)) { @@ -1820,9 +1243,9 @@ static void do_mount_cmd(UAContext *ua, const char *command) { STORE *store; BSOCK *sd; + JCR *jcr = ua->jcr; char dev_name[MAX_NAME_LENGTH]; - if (!open_db(ua)) { return; } @@ -1834,15 +1257,15 @@ static void do_mount_cmd(UAContext *ua, const char *command) } Dmsg2(120, "Found storage, MediaType=%s DevName=%s\n", - store->media_type, store->dev_name); + store->media_type, store->dev_name()); - ua->jcr->store = store; - if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) { + set_storage(jcr, store); + if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) { bsendmsg(ua, _("Failed to connect to Storage daemon.\n")); return; } - sd = ua->jcr->store_bsock; - strcpy(dev_name, store->dev_name); + sd = jcr->store_bsock; + bstrncpy(dev_name, store->dev_name(), sizeof(dev_name)); bash_spaces(dev_name); bnet_fsend(sd, "%s %s", command, dev_name); while (bnet_recv(sd) >= 0) { @@ -1850,7 +1273,7 @@ static void do_mount_cmd(UAContext *ua, const char *command) } bnet_sig(sd, BNET_TERMINATE); bnet_close(sd); - ua->jcr->store_bsock = NULL; + jcr->store_bsock = NULL; } /* @@ -1892,7 +1315,7 @@ static int use_cmd(UAContext *ua, const char *cmd) CAT *oldcatalog, *catalog; - close_db(ua); /* close any previously open db */ + close_db(ua); /* close any previously open db */ oldcatalog = ua->catalog; if (!(catalog = get_catalog_resource(ua))) { @@ -1902,38 +1325,36 @@ static int use_cmd(UAContext *ua, const char *cmd) } if (open_db(ua)) { bsendmsg(ua, _("Using Catalog name=%s DB=%s\n"), - ua->catalog->hdr.name, ua->catalog->db_name); + ua->catalog->hdr.name, ua->catalog->db_name); } return 1; } -int quit_cmd(UAContext *ua, const char *cmd) +int quit_cmd(UAContext *ua, const char *cmd) { ua->quit = TRUE; return 1; } /* - * Wait until no job is running + * Wait until no job is running */ -int wait_cmd(UAContext *ua, const char *cmd) +int wait_cmd(UAContext *ua, const char *cmd) { JCR *jcr; - bmicrosleep(0, 200000); /* let job actually start */ + bmicrosleep(0, 200000); /* let job actually start */ for (bool running=true; running; ) { running = false; - lock_jcr_chain(); foreach_jcr(jcr) { - if (jcr->JobId != 0) { - running = true; - free_locked_jcr(jcr); - break; - } - free_locked_jcr(jcr); + if (jcr->JobId != 0) { + running = true; + free_jcr(jcr); + break; + } + free_jcr(jcr); } - unlock_jcr_chain(); if (running) { - bmicrosleep(1, 0); + bmicrosleep(1, 0); } } return 1; @@ -1982,12 +1403,12 @@ int open_db(UAContext *ua) LockRes(); ua->catalog = (CAT *)GetNextRes(R_CATALOG, NULL); UnlockRes(); - if (!ua->catalog) { + if (!ua->catalog) { bsendmsg(ua, _("Could not find a Catalog resource\n")); - return 0; + return 0; } else { - bsendmsg(ua, _("Using default Catalog name=%s DB=%s\n"), - ua->catalog->hdr.name, ua->catalog->db_name); + bsendmsg(ua, _("Using default Catalog name=%s DB=%s\n"), + ua->catalog->hdr.name, ua->catalog->db_name); } } @@ -1995,11 +1416,12 @@ int open_db(UAContext *ua) 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); + ua->catalog->db_password, ua->catalog->db_address, + ua->catalog->db_port, ua->catalog->db_socket, + ua->catalog->mult_db_connections); if (!ua->db || !db_open_database(ua->jcr, ua->db)) { bsendmsg(ua, _("Could not open database \"%s\".\n"), - ua->catalog->db_name); + ua->catalog->db_name); if (ua->db) { bsendmsg(ua, "%s", db_strerror(ua->db)); } @@ -2017,7 +1439,7 @@ void close_db(UAContext *ua) db_close_database(ua->jcr, ua->db); ua->db = NULL; if (ua->jcr) { - ua->jcr->db = NULL; + ua->jcr->db = NULL; } } }