X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_update.c;h=f7e38bd5e66d1a3d00ea61e604f1987da30af766;hb=0796a980f144632ab1faa901883e619ebd291d04;hp=4339735ab6d5af9981c5453f6b1e24312b3f50b4;hpb=7efcaa512ea57338cf77d60f039b1c65b51e9c19;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_update.c b/bacula/src/dird/ua_update.c index 4339735ab6..f7e38bd5e6 100644 --- a/bacula/src/dird/ua_update.c +++ b/bacula/src/dird/ua_update.c @@ -1,14 +1,14 @@ /* 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. This program is Free Software; you can redistribute it and/or modify it under the terms of version two of the GNU General Public - License as published by the Free Software Foundation plus additions - that are listed in the file LICENSE. + License as published by the Free Software Foundation and included + in the file LICENSE. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -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); } /* @@ -386,13 +380,15 @@ static void update_vol_from_pool(UAContext *ua, MEDIA_DBR *mr) * Refresh the Volume information from the Pool record * for all Volumes */ -static void update_all_vols_from_pool(UAContext *ua) +static void update_all_vols_from_pool(UAContext *ua, const char *pool_name) { POOL_DBR pr; MEDIA_DBR mr; memset(&pr, 0, sizeof(pr)); memset(&mr, 0, sizeof(mr)); + + bstrncpy(pr.Name, pool_name, sizeof(pr.Name)); if (!get_pool_dbr(ua, &pr)) { return; } @@ -401,8 +397,45 @@ static void update_all_vols_from_pool(UAContext *ua) 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 Pool record.\n")); + ua->info_msg(_("All Volume defaults updated from \"%s\" Pool record.\n"), + pr.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) @@ -429,8 +462,10 @@ static void update_volenabled(UAContext *ua, char *val, MEDIA_DBR *mr) static int update_volume(UAContext *ua) { MEDIA_DBR mr; + POOL *pool; POOL_DBR pr; POOLMEM *query; + char buf[1000]; char ed1[130]; bool done = false; int i; @@ -456,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)) { @@ -502,7 +538,7 @@ static int update_volume(UAContext *ua) update_vol_from_pool(ua, &mr); return 1; case 11: - update_all_vols_from_pool(ua); + update_all_vols_from_pool(ua, ua->argv[j]); return 1; case 12: update_volenabled(ua, ua->argv[j], &mr); @@ -515,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 */ @@ -530,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; } @@ -624,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; @@ -651,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; } } @@ -684,10 +730,17 @@ static int update_volume(UAContext *ua) update_vol_from_pool(ua, &mr); return 1; case 12: - update_all_vols_from_pool(ua); + pool = select_pool_resource(ua); + if (pool) { + update_all_vols_from_pool(ua, pool->name()); + } 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; @@ -704,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)) { @@ -743,7 +796,7 @@ static bool update_pool(UAContext *ua) } memset(&pr, 0, sizeof(pr)); - bstrncpy(pr.Name, pool->hdr.name, sizeof(pr.Name)); + bstrncpy(pr.Name, pool->name(), sizeof(pr.Name)); if (!get_pool_dbr(ua, &pr)) { return false; } @@ -771,25 +824,87 @@ static bool update_pool(UAContext *ua) */ static bool update_job(UAContext *ua) { - bool done = false; int i; + char ed1[50], ed2[50]; + POOL_MEM cmd(PM_MESSAGE); + JOB_DBR jr; + CLIENT_DBR cr; + utime_t StartTime; + char *client_name = NULL; + char *start_time = NULL; const char *kw[] = { - NT_("StartTime"), /* 0 */ + NT_("starttime"), /* 0 */ + NT_("client"), /* 1 */ NULL }; + Dmsg1(200, "cmd=%s\n", ua->cmd); + i = find_arg_with_value(ua, NT_("jobid")); + if (i < 0) { + ua->error_msg(_("Expect JobId keyword, not found.\n")); + return false; + } + memset(&jr, 0, sizeof(jr)); + memset(&cr, 0, sizeof(cr)); + jr.JobId = str_to_int64(ua->argv[i]); + if (!db_get_job_record(ua->jcr, ua->db, &jr)) { + ua->error_msg("%s", db_strerror(ua->db)); + return false; + } for (i=0; kw[i]; i++) { int j; - if ((j=find_arg_with_value(ua, kw[i])) > 0) { + if ((j=find_arg_with_value(ua, kw[i])) >= 0) { switch (i) { - case 0: + case 0: /* start time */ + start_time = ua->argv[j]; break; - case 1: + case 1: /* Client name */ + client_name = ua->argv[j]; break; } - done = true; } } + if (!client_name && !start_time) { + ua->error_msg(_("Neither Client nor StartTime specified.\n")); + return 0; + } + if (client_name) { + if (!get_client_dbr(ua, &cr)) { + return false; + } + jr.ClientId = cr.ClientId; + } + if (start_time) { + utime_t delta_start; + StartTime = str_to_utime(start_time); + if (StartTime == 0) { + ua->error_msg(_("Improper date format: %s\n"), ua->argv[i]); + return false; + } + delta_start = StartTime - jr.StartTime; + Dmsg3(200, "ST=%d jr.ST=%d delta=%d\n", (time_t)StartTime, + (time_t)jr.StartTime, (time_t)delta_start); + jr.StartTime = (time_t)StartTime; + jr.SchedTime += (time_t)delta_start; + jr.EndTime += (time_t)delta_start; + jr.JobTDate += delta_start; + /* Convert to DB times */ + bstrutime(jr.cStartTime, sizeof(jr.cStartTime), jr.StartTime); + bstrutime(jr.cSchedTime, sizeof(jr.cSchedTime), jr.SchedTime); + bstrutime(jr.cEndTime, sizeof(jr.cEndTime), jr.EndTime); + } + Mmsg(cmd, "UPDATE Job SET ClientId=%s,StartTime='%s',SchedTime='%s'," + "EndTime='%s',JobTDate=%s WHERE JobId=%s", + edit_int64(jr.ClientId, ed1), + jr.cStartTime, + jr.cSchedTime, + jr.cEndTime, + edit_uint64(jr.JobTDate, ed1), + edit_int64(jr.JobId, ed2)); + if (!db_sql_query(ua->db, cmd.c_str(), NULL, NULL)) { + ua->error_msg("%s", db_strerror(ua->db)); + return false; + } return true; }