X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Fdird%2Fnewvol.c;h=6a542caa4d7b5f0e0b40baf2429359e494a792be;hb=4f7896c56213a88d17777db9041a9643ae541c5f;hp=9af68e6aa6a9b0858eb38af233b1437a532429b1;hpb=1f3edf3a27024df37e6de3d9b63b6d744808f628;p=bacula%2Fbacula diff --git a/bacula/src/dird/newvol.c b/bacula/src/dird/newvol.c index 9af68e6aa6..6a542caa4d 100644 --- a/bacula/src/dird/newvol.c +++ b/bacula/src/dird/newvol.c @@ -8,67 +8,140 @@ * This routine runs as a thread and must be thread reentrant. * * Basic tasks done here: - * If possible create a new Media entry + * If possible create a new Media entry * * Version $Id$ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2006 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 amended 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. */ #include "bacula.h" #include "dird.h" +/* Forward referenced functions */ +static bool create_simple_name(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr); +static bool perform_full_name_substitution(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr); + + /* - * Really crude automatic Volume name creation using - * LabelFormat + * Automatic Volume name creation using the LabelFormat + * + * The media record must have the PoolId filled in when + * calling this routine. */ -int newVolume(JCR *jcr, MEDIA_DBR *mr) +bool newVolume(JCR *jcr, MEDIA_DBR *mr) { POOL_DBR pr; - char name[MAXSTRING]; memset(&pr, 0, sizeof(pr)); /* See if we can create a new Volume */ - pr.PoolId = jcr->PoolId; - if (db_get_pool_record(jcr, jcr->db, &pr) && pr.LabelFormat[0] && - pr.LabelFormat[0] != '*') { - if (pr.MaxVols == 0 || pr.NumVols < pr.MaxVols) { - set_pool_dbr_defaults_in_media_dbr(mr, &pr); - mr->LabelDate = 0; - strcpy(mr->MediaType, jcr->store->media_type); - strcpy(name, pr.LabelFormat); - if (strchr(name, (int)'%') != NULL) { - Jmsg(jcr, M_ERROR, 0, _("Illegal character in Label Format\n")); - return 0; - } - strcat(name, "%04d"); - sprintf(mr->VolumeName, name, ++pr.NumVols); - if (db_create_media_record(jcr, jcr->db, mr) && - db_update_pool_record(jcr, jcr->db, &pr) == 1) { - Dmsg1(90, "Created new Volume=%s\n", mr->VolumeName); - return 1; - } else { - Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db)); - } + db_lock(jcr->db); + pr.PoolId = mr->PoolId; + if (!db_get_pool_record(jcr, jcr->db, &pr)) { + goto bail_out; + } + if (pr.MaxVols == 0 || pr.NumVols < pr.MaxVols) { + memset(mr, 0, sizeof(MEDIA_DBR)); + set_pool_dbr_defaults_in_media_dbr(mr, &pr); + jcr->VolumeName[0] = 0; + bstrncpy(mr->MediaType, jcr->store->media_type, sizeof(mr->MediaType)); + if (generate_job_event(jcr, "NewVolume") == 1 && jcr->VolumeName[0] && + is_volume_name_legal(NULL, jcr->VolumeName)) { + bstrncpy(mr->VolumeName, jcr->VolumeName, sizeof(mr->VolumeName)); + /* Check for special characters */ + } else if (pr.LabelFormat[0] && pr.LabelFormat[0] != '*') { + if (is_volume_name_legal(NULL, pr.LabelFormat)) { + /* No special characters, so apply simple algorithm */ + if (!create_simple_name(jcr, mr, &pr)) { + goto bail_out; + } + } else { /* try full substitution */ + /* Found special characters, so try substitution */ + if (!perform_full_name_substitution(jcr, mr, &pr)) { + goto bail_out; + } + if (!is_volume_name_legal(NULL, mr->VolumeName)) { + Jmsg(jcr, M_ERROR, 0, _("Illegal character in Volume name \"%s\"\n"), + mr->VolumeName); + goto bail_out; + } + } + } else { + goto bail_out; } + pr.NumVols++; + mr->Enabled = 1; + if (db_create_media_record(jcr, jcr->db, mr) && + db_update_pool_record(jcr, jcr->db, &pr)) { + db_unlock(jcr->db); + Jmsg(jcr, M_INFO, 0, _("Created new Volume \"%s\" in catalog.\n"), mr->VolumeName); + Dmsg1(90, "Created new Volume=%s\n", mr->VolumeName); + return true; + } else { + Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db)); + } + } +bail_out: + db_unlock(jcr->db); + return false; +} + +static bool create_simple_name(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr) +{ + char name[MAXSTRING]; + char num[20]; + + /* See if volume already exists */ + mr->VolumeName[0] = 0; + bstrncpy(name, pr->LabelFormat, sizeof(name)); + for (int i=pr->NumVols+1; i<(int)pr->NumVols+11; i++) { + MEDIA_DBR tmr; + memset(&tmr, 0, sizeof(tmr)); + sprintf(num, "%04d", i); + bstrncpy(tmr.VolumeName, name, sizeof(tmr.VolumeName)); + bstrncat(tmr.VolumeName, num, sizeof(tmr.VolumeName)); + if (db_get_media_record(jcr, jcr->db, &tmr)) { + Jmsg(jcr, M_WARNING, 0, + _("Wanted to create Volume \"%s\", but it already exists. Trying again.\n"), + tmr.VolumeName); + continue; + } + bstrncpy(mr->VolumeName, name, sizeof(mr->VolumeName)); + bstrncat(mr->VolumeName, num, sizeof(mr->VolumeName)); + break; /* Got good name */ + } + if (mr->VolumeName[0] == 0) { + Jmsg(jcr, M_ERROR, 0, _("Too many failures. Giving up creating Volume name.\n")); + return false; + } + return true; +} + +/* + * Perform full substitution on Label + */ +static bool perform_full_name_substitution(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr) +{ + bool ok = false; + POOLMEM *label = get_pool_memory(PM_FNAME); + jcr->NumVols = pr->NumVols; + if (variable_expansion(jcr, pr->LabelFormat, &label)) { + bstrncpy(mr->VolumeName, label, sizeof(mr->VolumeName)); + ok = true; } - return 0; + free_pool_memory(label); + return ok; }