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(050, "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
* 2. Try finding a recycled volume
*/
ok = find_recycled_volume(jcr, InChanger, mr);
- Dmsg2(150, "find_recycled_volume ok=%d FW=%d\n", ok, mr->FirstWritten);
+ Dmsg2(050, "find_recycled_volume ok=%d FW=%d\n", ok, mr->FirstWritten);
if (!ok) {
/*
* 3. Try recycling any purged volume
prune_volumes(jcr, InChanger, mr);
}
ok = recycle_oldest_purged_volume(jcr, InChanger, mr);
- if (!ok) {
+ if (!ok && create) {
Dmsg4(050, "after prune volumes_vol ok=%d index=%d InChanger=%d Vstat=%s\n",
ok, index, InChanger, mr->VolStatus);
/*
*/
if (!ok && (jcr->pool->purge_oldest_volume ||
jcr->pool->recycle_oldest_volume)) {
- Dmsg2(200, "No next volume found. PurgeOldest=%d\n RecyleOldest=%d",
+ Dmsg2(050, "No next volume found. PurgeOldest=%d\n RecyleOldest=%d",
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(050, "Find oldest=%d\n", ok);
if (ok && prune) {
UAContext *ua;
- Dmsg0(400, "Try purge.\n");
+ Dmsg0(050, "Try purge.\n");
/*
* 7. Try to purging oldest volume only if not UA calling us.
*/
free_ua_context(ua);
if (ok) {
ok = recycle_volume(jcr, mr);
- Dmsg1(400, "Recycle after purge oldest=%d\n", ok);
+ Dmsg1(050, "Recycle after purge oldest=%d\n", ok);
}
}
}
}
- Dmsg2(100, "VolJobs=%d FirstWritten=%d\n", mr->VolJobs, mr->FirstWritten);
+ Dmsg2(050, "VolJobs=%d FirstWritten=%d\n", mr->VolJobs, mr->FirstWritten);
if (ok) {
/* If we can use the volume, check if it is expired */
if (has_volume_expired(jcr, mr)) {
break;
} /* end for loop */
db_unlock(jcr->db);
- Dmsg1(150, "return ok=%d find_next_vol\n", ok);
+ Dmsg1(050, "return ok=%d find_next_vol\n", ok);
return ok;
}
} 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;
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;
* that we can add a Volume.
*/
memset(&pr, 0, sizeof(pr));
- bstrncpy(pr.Name, jcr->pool->hdr.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;
- }
-
- 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);
- goto bail_out;
- }
- /* OK, now move Scratch Volume */
-
- /*
- * Get *full* media record to return as db_find_next_volume does
- * not return everything .
- */
- mr->MediaId = smr.MediaId;
- if (!db_get_media_record(jcr, jcr->db, mr)) {
- Jmsg(jcr, M_WARNING, 0, _("Unable to get Volume record: ERR=%s"),
- db_strerror(jcr->db));
- goto bail_out;
- }
- /* 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,
- */
- bstrncpy(mr->VolStatus, smr.VolStatus, sizeof(smr.VolStatus));
- if (!db_update_media_record(jcr, jcr->db, mr)) {
- 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"),
- mr->VolumeName);
-
- ok = true;
+ 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->name(), pr.MaxVols);
+ goto bail_out;
+ }
+
+ 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, 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, _("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"),
+ mr->VolumeName);
+
+ ok = true;
}
}
bail_out:
projects / bacula / bacula / blobdiff