X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_update.c;h=f7e38bd5e66d1a3d00ea61e604f1987da30af766;hb=0796a980f144632ab1faa901883e619ebd291d04;hp=4bbd113c598dda11d3d0cc22771cd0b4c09819d9;hpb=0a572112e8cfd9f066e69c12764a2131764d34a2;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_update.c b/bacula/src/dird/ua_update.c index 4bbd113c59..f7e38bd5e6 100644 --- a/bacula/src/dird/ua_update.c +++ b/bacula/src/dird/ua_update.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + Copyright (C) 2000-2008 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -242,7 +242,7 @@ static void update_volrecycle(UAContext *ua, char *val, MEDIA_DBR *mr) ua->error_msg("%s", db_strerror(ua->db)); } else { ua->info_msg(_("New Recycle flag is: %s\n"), - mr->Recycle==1?_("yes"):_("no")); + recycle==1?_("yes"):_("no")); } } @@ -262,7 +262,7 @@ static void update_volinchanger(UAContext *ua, char *val, MEDIA_DBR *mr) ua->error_msg("%s", db_strerror(ua->db)); } else { ua->info_msg(_("New InChanger flag is: %s\n"), - mr->InChanger==1?_("yes"):_("no")); + InChanger==1?_("yes"):_("no")); } } @@ -298,7 +298,7 @@ static void update_volslot(UAContext *ua, char *val, MEDIA_DBR *mr) void update_vol_pool(UAContext *ua, char *val, MEDIA_DBR *mr, POOL_DBR *opr) { POOL_DBR pr; - POOLMEM *query; + POOL_MEM query(PM_MESSAGE); char ed1[50], ed2[50]; memset(&pr, 0, sizeof(pr)); @@ -309,12 +309,10 @@ void update_vol_pool(UAContext *ua, char *val, MEDIA_DBR *mr, POOL_DBR *opr) mr->PoolId = pr.PoolId; /* set new PoolId */ /* */ - query = get_pool_memory(PM_MESSAGE); db_lock(ua->db); Mmsg(query, "UPDATE Media SET PoolId=%s WHERE MediaId=%s", - edit_int64(mr->PoolId, ed1), - edit_int64(mr->MediaId, ed2)); - if (!db_sql_query(ua->db, query, NULL, NULL)) { + edit_int64(mr->PoolId, ed1), edit_int64(mr->MediaId, ed2)); + if (!db_sql_query(ua->db, query.c_str(), NULL, NULL)) { ua->error_msg("%s", db_strerror(ua->db)); } else { ua->info_msg(_("New Pool is: %s\n"), pr.Name); @@ -328,14 +326,13 @@ void update_vol_pool(UAContext *ua, char *val, MEDIA_DBR *mr, POOL_DBR *opr) } } db_unlock(ua->db); - free_pool_memory(query); } /* Modify the RecyclePool of a Volume */ void update_vol_recyclepool(UAContext *ua, char *val, MEDIA_DBR *mr) { POOL_DBR pr; - POOLMEM *query; + POOL_MEM query(PM_MESSAGE); char ed1[50], ed2[50]; memset(&pr, 0, sizeof(pr)); @@ -346,18 +343,15 @@ void update_vol_recyclepool(UAContext *ua, char *val, MEDIA_DBR *mr) /* pool = select_pool_resource(ua); */ mr->RecyclePoolId = pr.PoolId; /* get the PoolId */ - query = get_pool_memory(PM_MESSAGE); db_lock(ua->db); Mmsg(query, "UPDATE Media SET RecyclePoolId=%s WHERE MediaId=%s", - edit_int64(mr->RecyclePoolId, ed1), - edit_int64(mr->MediaId, ed2)); - if (!db_sql_query(ua->db, query, NULL, NULL)) { + edit_int64(mr->RecyclePoolId, ed1), edit_int64(mr->MediaId, ed2)); + if (!db_sql_query(ua->db, query.c_str(), NULL, NULL)) { ua->error_msg("%s", db_strerror(ua->db)); } else { ua->info_msg(_("New RecyclePool is: %s\n"), pr.Name); } db_unlock(ua->db); - free_pool_memory(query); } /* @@ -408,6 +402,42 @@ static void update_all_vols_from_pool(UAContext *ua, const char *pool_name) } } +static void update_all_vols(UAContext *ua) +{ + int i, num_pools; + uint32_t *ids; + POOL_DBR pr; + MEDIA_DBR mr; + + memset(&pr, 0, sizeof(pr)); + memset(&mr, 0, sizeof(mr)); + + if (!db_get_pool_ids(ua->jcr, ua->db, &num_pools, &ids)) { + ua->error_msg(_("Error obtaining pool ids. ERR=%s\n"), db_strerror(ua->db)); + return; + } + + for (i=0; ijcr, ua->db, &pr)) { /* ***FIXME*** use acl? */ + ua->warning_msg(_("Updating all pools, but skipped PoolId=%d. ERR=%s\n"), db_strerror(ua->db)); + continue; + } + + set_pool_dbr_defaults_in_media_dbr(&mr, &pr); + mr.PoolId = pr.PoolId; + + if (!db_update_media_defaults(ua->jcr, ua->db, &mr)) { + ua->error_msg(_("Error updating Volume records: ERR=%s"), db_strerror(ua->db)); + } else { + ua->info_msg(_("All Volume defaults updated from \"%s\" Pool record.\n"), + pr.Name); + } + } + + free(ids); +} + static void update_volenabled(UAContext *ua, char *val, MEDIA_DBR *mr) { mr->Enabled = get_enabled(ua, val); @@ -435,6 +465,7 @@ static int update_volume(UAContext *ua) POOL *pool; POOL_DBR pr; POOLMEM *query; + char buf[1000]; char ed1[130]; bool done = false; int i; @@ -460,6 +491,7 @@ static int update_volume(UAContext *ua) for (i=0; kw[i]; i++) { int j; POOL_DBR pr; + if ((j=find_arg_with_value(ua, kw[i])) > 0) { /* If all from pool don't select a media record */ if (i != AllFromPool && !select_media_dbr(ua, &mr)) { @@ -519,6 +551,12 @@ static int update_volume(UAContext *ua) } } + /* Allow user to simply update all volumes */ + if (find_arg(ua, NT_("fromallpools")) > 0) { + update_all_vols(ua); + return 1; + } + for ( ; !done; ) { start_prompt(ua, _("Parameters to modify:\n")); add_prompt(ua, _("Volume Status")); /* 0 */ @@ -534,13 +572,15 @@ static int update_volume(UAContext *ua) add_prompt(ua, _("Pool")); /* 10 */ add_prompt(ua, _("Volume from Pool")); /* 11 */ add_prompt(ua, _("All Volumes from Pool")); /* 12 */ - add_prompt(ua, _("Enabled")), /* 13 */ - add_prompt(ua, _("RecyclePool")), /* 14 */ - add_prompt(ua, _("Done")); /* 15 */ + add_prompt(ua, _("All Volumes from all Pools")); /* 13 */ + add_prompt(ua, _("Enabled")), /* 14 */ + add_prompt(ua, _("RecyclePool")), /* 15 */ + add_prompt(ua, _("Done")); /* 16 */ i = do_prompt(ua, "", _("Select parameter to modify"), NULL, 0); - /* For All Volumes from Pool and Done, we don't need a Volume record */ - if (i != 12 && i != 15) { + /* For All Volumes, All Volumes from Pool, and Done, we don't need + * a Volume record */ + if ( i != 12 && i != 13 && i != 16) { if (!select_media_dbr(ua, &mr)) { /* Get Volume record */ return 0; } @@ -628,7 +668,9 @@ static int update_volume(UAContext *ua) case 8: /* InChanger */ ua->info_msg(_("Current InChanger flag is: %d\n"), mr.InChanger); - if (!get_yesno(ua, _("Set InChanger flag? yes/no: "))) { + bsnprintf(buf, sizeof(buf), _("Set InChanger flag for Volume \"%s\": yes/no: "), + mr.VolumeName); + if (!get_yesno(ua, buf)) { return 0; } mr.InChanger = ua->pint32_val; @@ -655,7 +697,7 @@ static int update_volume(UAContext *ua) VolFiles = ua->pint32_val; if (VolFiles != (int)(mr.VolFiles + 1)) { ua->warning_msg(_("Normally, you should only increase Volume Files by one!\n")); - if (!get_yesno(ua, _("Continue? (yes/no): ")) || ua->pint32_val == 0) { + if (!get_yesno(ua, _("Increase Volume Files? (yes/no): ")) || ua->pint32_val == 0) { break; } } @@ -695,6 +737,10 @@ static int update_volume(UAContext *ua) return 1; case 13: + update_all_vols(ua); + return 1; + + case 14: ua->info_msg(_("Current Enabled is: %d\n"), mr.Enabled); if (!get_cmd(ua, _("Enter new Enabled: "))) { return 0; @@ -711,7 +757,7 @@ static int update_volume(UAContext *ua) update_volenabled(ua, ua->cmd, &mr); break; - case 14: + case 15: memset(&pr, 0, sizeof(POOL_DBR)); pr.PoolId = mr.RecyclePoolId; if (db_get_pool_record(ua->jcr, ua->db, &pr)) {