/*
* 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
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
*/
if (prune) {
Dmsg0(150, "Call prune_volumes\n");
- ok = prune_volumes(jcr, InChanger, mr);
+ prune_volumes(jcr, InChanger, mr);
}
- if (!ok) {
- ok = recycle_oldest_purged_volume(jcr, InChanger, mr);
- if (!ok && create) {
- Dmsg4(050, "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, InChanger, mr);
- Dmsg4(050, "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 (!ok && InChanger) {
- InChanger = false;
- continue; /* retry again accepting any volume */
- }
- }
- }
+ ok = recycle_oldest_purged_volume(jcr, InChanger, mr);
+ 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, 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 (!ok && InChanger) {
+ InChanger = false;
+ continue; /* retry again accepting any volume */
+ }
+ }
}
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.
*/
}
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;
}
*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");
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;