X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fnext_vol.c;h=462d4550237e8e14cc04d0e105fd4197fe8c62a4;hb=928fa1c1a90e32611cdceecc19672945757af154;hp=460afbd99a5d9b7de4482647343e1ed62ff7c147;hpb=cd81995314972c78e359e777cb70bfd4d927e5a0;p=bacula%2Fbacula diff --git a/bacula/src/dird/next_vol.c b/bacula/src/dird/next_vol.c index 460afbd99a..462d455023 100644 --- a/bacula/src/dird/next_vol.c +++ b/bacula/src/dird/next_vol.c @@ -1,14 +1,14 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2001-2007 Free Software Foundation Europe e.V. + Copyright (C) 2001-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 @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Bacula® is a registered trademark of John Walker. + Bacula® is a registered trademark of Kern Sibbald. The licensor of Bacula is the Free Software Foundation Europe (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. @@ -39,12 +39,11 @@ #include "bacula.h" #include "dird.h" -static bool get_scratch_volume(JCR *jcr, MEDIA_DBR *mr, bool InChanger); - - /* * Items needed: * mr.PoolId must be set + * mr.StorageId should also be set + * mr.ScratchPoolId could be set (used if create==true) * jcr->wstore * jcr->db * jcr->pool @@ -60,7 +59,8 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, int index, STORE *store = jcr->wstore; bstrncpy(mr->MediaType, store->media_type, sizeof(mr->MediaType)); - Dmsg2(150, "find_next_vol_for_append: PoolId=%d, MediaType=%s\n", (int)mr->PoolId, mr->MediaType); + Dmsg3(100, "find_next_vol_for_append: JobId=%u PoolId=%d, MediaType=%s\n", + (uint32_t)jcr->JobId, (int)mr->PoolId, mr->MediaType); /* * If we are using an Autochanger, restrict Volume * search to the Autochanger on the first pass @@ -78,7 +78,7 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, int index, ok = db_find_next_volume(jcr, jcr->db, index, InChanger, mr); if (!ok) { - Dmsg4(050, "after find_next_vol ok=%d index=%d InChanger=%d Vstat=%s\n", + Dmsg4(150, "after find_next_vol ok=%d index=%d InChanger=%d Vstat=%s\n", ok, index, InChanger, mr->VolStatus); /* * 2. Try finding a recycled volume @@ -94,28 +94,28 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, int index, /* * 4. Try pruning Volumes */ - Dmsg0(150, "Call prune_volumes\n"); if (prune) { - prune_volumes(jcr, mr); + Dmsg0(150, "Call prune_volumes\n"); + prune_volumes(jcr, InChanger, mr); } ok = recycle_oldest_purged_volume(jcr, InChanger, mr); - if (!ok) { - Dmsg4(050, "after prune volumes_vol ok=%d index=%d InChanger=%d Vstat=%s\n", + if (!ok && create) { + Dmsg4(150, "after prune volumes_vol ok=%d index=%d InChanger=%d Vstat=%s\n", ok, index, InChanger, mr->VolStatus); /* * 5. Try pulling a volume from the Scratch pool */ - ok = get_scratch_volume(jcr, mr, InChanger); + ok = get_scratch_volume(jcr, InChanger, mr); + Dmsg4(150, "after get scratch volume ok=%d index=%d InChanger=%d Vstat=%s\n", + ok, index, InChanger, mr->VolStatus); } /* * If we are using an Autochanger and have not found * a volume, retry looking for any volume. */ - if (InChanger) { + if (!ok && InChanger) { InChanger = false; - if (!ok) { - continue; /* retry again accepting any volume */ - } + continue; /* retry again accepting any volume */ } } } @@ -136,10 +136,10 @@ int find_next_volume_for_append(JCR *jcr, MEDIA_DBR *mr, int index, jcr->pool->purge_oldest_volume, jcr->pool->recycle_oldest_volume); /* Find oldest volume to recycle */ ok = db_find_next_volume(jcr, jcr->db, -1, InChanger, mr); - Dmsg1(400, "Find oldest=%d\n", ok); + Dmsg1(200, "Find oldest=%d Volume\n", ok); if (ok && prune) { UAContext *ua; - Dmsg0(400, "Try purge.\n"); + Dmsg0(200, "Try purge Volume.\n"); /* * 7. Try to purging oldest volume only if not UA calling us. */ @@ -212,6 +212,8 @@ bool has_volume_expired(JCR *jcr, MEDIA_DBR *mr) } else if (mr->MaxVolJobs > 0 && mr->MaxVolJobs <= mr->VolJobs) { Jmsg(jcr, M_INFO, 0, _("Max Volume jobs exceeded. " "Marking Volume \"%s\" as Used.\n"), mr->VolumeName); + Dmsg3(100, "MaxVolJobs=%d JobId=%d Vol=%s\n", mr->MaxVolJobs, + (uint32_t)jcr->JobId, mr->VolumeName); bstrncpy(mr->VolStatus, "Used", sizeof(mr->VolStatus)); expired = true; @@ -236,11 +238,13 @@ bool has_volume_expired(JCR *jcr, MEDIA_DBR *mr) } if (expired) { /* Need to update media */ + Dmsg1(150, "Vol=%s has expired update media record\n", mr->VolumeName); if (!db_update_media_record(jcr, jcr->db, mr)) { Jmsg(jcr, M_ERROR, 0, _("Catalog error updating volume \"%s\". ERR=%s"), mr->VolumeName, db_strerror(jcr->db)); } } + Dmsg2(150, "Vol=%s expired=%d\n", mr->VolumeName, expired); return expired; } @@ -256,6 +260,11 @@ void check_if_volume_valid_or_recyclable(JCR *jcr, MEDIA_DBR *mr, const char **r *reason = NULL; + if (!mr->Recycle) { + *reason = _("volume has recycling disabled"); + return; + } + /* Check if a duration or limit has expired */ if (has_volume_expired(jcr, mr)) { *reason = _("volume has expired"); @@ -328,21 +337,24 @@ void check_if_volume_valid_or_recyclable(JCR *jcr, MEDIA_DBR *mr, const char **r static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -static bool get_scratch_volume(JCR *jcr, MEDIA_DBR *mr, bool InChanger) +bool get_scratch_volume(JCR *jcr, bool InChanger, MEDIA_DBR *mr) { - MEDIA_DBR smr; + MEDIA_DBR smr; /* for searching scratch pool */ POOL_DBR spr, pr; bool ok = false; bool found = false; - char ed1[50], ed2[50]; /* Only one thread at a time can pull from the scratch pool */ P(mutex); /* * Get Pool record for Scratch Pool + * choose between ScratchPoolId and Scratch + * db_get_pool_record will first try ScratchPoolId, + * and then try the pool named Scratch */ memset(&spr, 0, sizeof(spr)); bstrncpy(spr.Name, "Scratch", sizeof(spr.Name)); + spr.PoolId = mr->ScratchPoolId; if (db_get_pool_record(jcr, jcr->db, &spr)) { memset(&smr, 0, sizeof(smr)); smr.PoolId = spr.PoolId; @@ -375,45 +387,44 @@ static bool get_scratch_volume(JCR *jcr, MEDIA_DBR *mr, bool InChanger) * that we can add a Volume. */ memset(&pr, 0, sizeof(pr)); - bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name)); + bstrncpy(pr.Name, jcr->pool->name(), sizeof(pr.Name)); + if (!db_get_pool_record(jcr, jcr->db, &pr)) { Jmsg(jcr, M_WARNING, 0, _("Unable to get Pool record: ERR=%s"), db_strerror(jcr->db)); goto bail_out; } + + /* Make sure there is room for another volume */ if (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) { Jmsg(jcr, M_WARNING, 0, _("Unable add Scratch Volume, Pool \"%s\" full MaxVols=%d\n"), - jcr->pool->hdr.name, pr.MaxVols); + jcr->pool->name(), pr.MaxVols); goto bail_out; } - /* OK, now move Scratch Volume */ - db_lock(jcr->db); - Mmsg(query, "UPDATE Media SET PoolId=%s WHERE MediaId=%s", - edit_int64(mr->PoolId, ed1), - edit_int64(smr.MediaId, ed2)); - ok = db_sql_query(jcr->db, query.c_str(), NULL, NULL); - db_unlock(jcr->db); - if (!ok) { - Jmsg(jcr, M_WARNING, 0, _("Failed to move Scratch Volume. ERR=%s\n"), - db_strerror(jcr->db)); - goto bail_out; - } - Jmsg(jcr, M_INFO, 0, _("Using Volume \"%s\" from 'Scratch' pool.\n"), - smr.VolumeName); - /* Set new Pool Id in smr record, then copy it to mr */ - smr.PoolId = mr->PoolId; - memcpy(mr, &smr, sizeof(MEDIA_DBR)); + memcpy(mr, &smr, sizeof(MEDIA_DBR)); + /* Set default parameters from current pool */ set_pool_dbr_defaults_in_media_dbr(mr, &pr); - /* set_pool_dbr_defaults_in_media_dbr set VolStatus to Append, - * we could have Recycled media */ + + /* + * set_pool_dbr_defaults_in_media_dbr set VolStatus to Append, + * we could have Recycled media, also, we retain the old + * RecyclePoolId. + */ bstrncpy(mr->VolStatus, smr.VolStatus, sizeof(smr.VolStatus)); + mr->RecyclePoolId = smr.RecyclePoolId; + if (!db_update_media_record(jcr, jcr->db, mr)) { - Jmsg(jcr, M_WARNING, 0, _("Unable to update Volume record: ERR=%s"), + Jmsg(jcr, M_WARNING, 0, _("Failed to move Scratch Volume. ERR=%s\n"), db_strerror(jcr->db)); - ok = false; + goto bail_out; } + + Jmsg(jcr, M_INFO, 0, _("Using Volume \"%s\" from 'Scratch' pool.\n"), + mr->VolumeName); + + ok = true; } } bail_out: