#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
/*
* 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) {
/*
* 5. Try pulling a volume from the Scratch pool
*/
- ok = get_scratch_volume(jcr, mr, InChanger);
+ ok = get_scratch_volume(jcr, InChanger, mr);
}
/*
* If we are using an Autochanger and have not found
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);
* 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: