static char Update_media[] = "CatReq Job=%127s UpdateMedia VolName=%s\
VolJobs=%u VolFiles=%u VolBlocks=%u VolBytes=%" lld " VolMounts=%u\
VolErrors=%u VolWrites=%u MaxVolBytes=%" lld " EndTime=%d VolStatus=%10s\
- Slot=%d relabel=%d\n";
+ Slot=%d relabel=%d InChanger=%d VolReadTime=%" lld " VolWriteTime=%" lld "\n";
static char Create_job_media[] = "CatReq Job=%127s CreateJobMedia \
FirstIndex=%u LastIndex=%u StartFile=%u EndFile=%u \
/* Responses sent to Storage daemon */
-static char OK_media[] = "1000 OK VolName=%s VolJobs=%u VolFiles=%u\
- VolBlocks=%u VolBytes=%s VolMounts=%u VolErrors=%u VolWrites=%u\
- MaxVolBytes=%s VolCapacityBytes=%s VolStatus=%s Slot=%d\
- MaxVolJobs=%u MaxVolFiles=%u\n";
+static char OK_media[] = "1000 OK VolName=%s VolJobs=%u VolFiles=%u"
+ " VolBlocks=%u VolBytes=%s VolMounts=%u VolErrors=%u VolWrites=%u"
+ " MaxVolBytes=%s VolCapacityBytes=%s VolStatus=%s Slot=%d"
+ " MaxVolJobs=%u MaxVolFiles=%u InChanger=%d VolReadTime=%s"
+ " VolWriteTime=%s\n";
-static char OK_update[] = "1000 OK UpdateMedia\n";
+static char OK_create[] = "1000 OK CreateJobMedia\n";
-/* static char FileAttributes[] = "UpdCat Job=%127s FileAttributes "; */
+static int send_volume_info_to_storage_daemon(JCR *jcr, BSOCK *sd, MEDIA_DBR *mr)
+{
+ int stat;
+ char ed1[50], ed2[50], ed3[50], ed4[50], ed5[50];
+
+ jcr->MediaId = mr->MediaId;
+ pm_strcpy(&jcr->VolumeName, mr->VolumeName);
+ bash_spaces(mr->VolumeName);
+ stat = bnet_fsend(sd, OK_media, mr->VolumeName, mr->VolJobs,
+ mr->VolFiles, mr->VolBlocks, edit_uint64(mr->VolBytes, ed1),
+ mr->VolMounts, mr->VolErrors, mr->VolWrites,
+ edit_uint64(mr->MaxVolBytes, ed2),
+ edit_uint64(mr->VolCapacityBytes, ed3),
+ mr->VolStatus, mr->Slot, mr->MaxVolJobs, mr->MaxVolFiles,
+ mr->InChanger,
+ edit_uint64(mr->VolReadTime, ed4),
+ edit_uint64(mr->VolWriteTime, ed5));
+ unbash_spaces(mr->VolumeName);
+ Dmsg2(200, "Vol Info for %s: %s", jcr->Job, sd->msg);
+ return stat;
+}
void catalog_request(JCR *jcr, BSOCK *bs, char *msg)
{
MEDIA_DBR mr, sdmr;
JOBMEDIA_DBR jm;
char Job[MAX_NAME_LENGTH];
- int index, ok, relabel, writing;
+ int index, ok, label, writing;
POOLMEM *omsg;
memset(&mr, 0, sizeof(mr));
*/
Dmsg1(200, "catreq %s", bs->msg);
if (sscanf(bs->msg, Find_media, &Job, &index) == 2) {
- ok = find_next_volume_for_append(jcr, &mr, TRUE /*create*/);
+ ok = find_next_volume_for_append(jcr, &mr, TRUE /*permit create new vol*/);
/*
* Send Find Media response to Storage daemon
*/
if (ok) {
- char ed1[50], ed2[50], ed3[50];
- jcr->MediaId = mr.MediaId;
- pm_strcpy(&jcr->VolumeName, mr.VolumeName);
- bash_spaces(mr.VolumeName);
- bnet_fsend(bs, OK_media, mr.VolumeName, mr.VolJobs,
- mr.VolFiles, mr.VolBlocks, edit_uint64(mr.VolBytes, ed1),
- mr.VolMounts, mr.VolErrors, mr.VolWrites,
- edit_uint64(mr.MaxVolBytes, ed2),
- edit_uint64(mr.VolCapacityBytes, ed3),
- mr.VolStatus, mr.Slot, mr.MaxVolJobs, mr.MaxVolFiles);
- Dmsg2(100, "Find media for %s: %s", jcr->Job, bs->msg);
+ send_volume_info_to_storage_daemon(jcr, bs, &mr);
} else {
bnet_fsend(bs, "1901 No Media.\n");
}
*/
unbash_spaces(mr.VolumeName);
if (db_get_media_record(jcr, jcr->db, &mr)) {
- bool VolSuitable = false;
- char *reason = ""; /* detailed reason for rejection */
- jcr->MediaId = mr.MediaId;
- Dmsg1(120, "VolumeInfo MediaId=%d\n", jcr->MediaId);
- pm_strcpy(&jcr->VolumeName, mr.VolumeName);
- if (!writing) {
- VolSuitable = true; /* accept anything for read */
- } else {
+ char *reason = NULL; /* detailed reason for rejection */
+ /*
+ * If we are reading, accept any volume (reason == NULL)
+ * If we are writing, check if the Volume is valid
+ * for this job, and do a recycle if necessary
+ */
+ if (writing) {
/*
* SD wants to write this Volume, so make
* sure it is suitable for this job, i.e.
*/
if (mr.PoolId != jcr->PoolId) {
reason = "not in Pool";
- } else if (strcmp(mr.VolStatus, "Append") != 0 &&
- strcmp(mr.VolStatus, "Recycle") != 0 &&
- strcmp(mr.VolStatus, "Purged") != 0) {
- reason = "not Append, Purged or Recycle";
- /* What we're trying to do here is see if the current volume is
- * "recycleable" - ie. if we prune all expired jobs off it, is
- * it now possible to reuse it for the job that it is currently
- * needed for?
- */
- if ((mr.LastWritten + mr.VolRetention) < (utime_t)time(NULL)
- && mr.Recycle && jcr->pool->recycle_current_volume
- && (strcmp(mr.VolStatus, "Full") == 0 ||
- strcmp(mr.VolStatus, "Used") == 0)) {
- /*
- * Attempt prune of current volume to see if we can
- * recycle it for use.
- */
- UAContext *ua;
-
- ua = new_ua_context(jcr);
- ok = prune_volume(ua, &mr);
- free_ua_context(ua);
-
- if (ok) {
- /* If fully purged, recycle current volume */
- if (recycle_volume(jcr, &mr)) {
- Jmsg(jcr, M_INFO, 0, "Recycled current "
- "volume \"%s\"\n", mr.VolumeName);
- VolSuitable = true;
- } else {
- reason = "not Append, Purged or Recycle (recycling of the "
- "current volume failed)";
- }
- } else {
- reason = "not Append, Purged or Recycle (cannot automatically "
- "recycle current volume, as it still contains "
- "unpruned data)";
- }
- }
} else if (strcmp(mr.MediaType, jcr->store->media_type) != 0) {
reason = "not correct MediaType";
- } else if (!jcr->pool->accept_any_volume) {
- reason = "Volume not in sequence";
- } else if (strcmp(mr.VolStatus, "Purged") == 0) {
- if (recycle_volume(jcr, &mr)) {
- Jmsg(jcr, M_INFO, 0, "Recycled current "
- "volume \"%s\"\n", mr.VolumeName);
- VolSuitable = true;
- } else {
- /* In principle this shouldn't happen */
- reason = "recycling of current volume failed";
- }
} else {
- VolSuitable = true;
+ /*
+ * ****FIXME***
+ * This test (accept_any_volume) is turned off
+ * because it doesn't properly check if the volume
+ * really is out of sequence!
+ *
+ * } else if (!jcr->pool->accept_any_volume) {
+ * reason = "Volume not in sequence";
+ */
+
+ /*
+ * Now try recycling if necessary
+ * reason set non-NULL if we cannot use it
+ */
+ check_if_volume_valid_or_recyclable(jcr, &mr, &reason);
}
}
- if (VolSuitable) {
- char ed1[50], ed2[50], ed3[50];
+ if (reason == NULL) {
/*
* Send Find Media response to Storage daemon
*/
- bash_spaces(mr.VolumeName);
- bnet_fsend(bs, OK_media, mr.VolumeName, mr.VolJobs,
- mr.VolFiles, mr.VolBlocks, edit_uint64(mr.VolBytes, ed1),
- mr.VolMounts, mr.VolErrors, mr.VolWrites,
- edit_uint64(mr.MaxVolBytes, ed2),
- edit_uint64(mr.VolCapacityBytes, ed3),
- mr.VolStatus, mr.Slot, mr.MaxVolJobs, mr.MaxVolFiles);
- Dmsg2(100, "Vol Info for %s: %s", jcr->Job, bs->msg);
+ send_volume_info_to_storage_daemon(jcr, bs, &mr);
} else {
/* Not suitable volume */
- bnet_fsend(bs, "1998 Volume \"%s\" %s.\n",
- mr.VolumeName, reason);
+ bnet_fsend(bs, "1998 Volume \"%s\" status is %s, %s.\n", mr.VolumeName,
+ mr.VolStatus, reason);
}
} else {
/*
* Request to update Media record. Comes typically at the end
- * of a Storage daemon Job Session
+ * of a Storage daemon Job Session or when labeling/relabeling a
+ * Volume.
*/
} else if (sscanf(bs->msg, Update_media, &Job, &sdmr.VolumeName, &sdmr.VolJobs,
&sdmr.VolFiles, &sdmr.VolBlocks, &sdmr.VolBytes, &sdmr.VolMounts, &sdmr.VolErrors,
&sdmr.VolWrites, &sdmr.MaxVolBytes, &sdmr.LastWritten, &sdmr.VolStatus,
- &sdmr.Slot, &relabel) == 14) {
+ &sdmr.Slot, &label, &sdmr.InChanger, &sdmr.VolReadTime,
+ &sdmr.VolWriteTime) == 17) {
db_lock(jcr->db);
- Dmsg3(400, "Update media %s oldStat=%s newStat=%s\n", sdmr.VolumeName,
+ Dmsg3(100, "Update media %s oldStat=%s newStat=%s\n", sdmr.VolumeName,
mr.VolStatus, sdmr.VolStatus);
bstrncpy(mr.VolumeName, sdmr.VolumeName, sizeof(mr.VolumeName)); /* copy Volume name */
unbash_spaces(mr.VolumeName);
if (mr.VolJobs == 0 || sdmr.VolJobs == 1) {
mr.FirstWritten = jcr->start_time; /* use Job start time as first write */
}
- Dmsg2(200, "Update media: BefVolJobs=%u After=%u\n", mr.VolJobs, sdmr.VolJobs);
+ /* If we just labeled the tape set time */
+ Dmsg2(100, "label=%d labeldate=%d\n", label, mr.LabelDate);
+ if (label || mr.LabelDate == 0) {
+ mr.LabelDate = time(NULL);
+ }
+ Dmsg2(100, "Update media: BefVolJobs=%u After=%u\n", mr.VolJobs, sdmr.VolJobs);
/* Copy updated values to original media record */
- mr.VolJobs = sdmr.VolJobs;
- mr.VolFiles = sdmr.VolFiles;
- mr.VolBlocks = sdmr.VolBlocks;
- mr.VolBytes = sdmr.VolBytes;
- mr.VolMounts = sdmr.VolMounts;
- mr.VolErrors = sdmr.VolErrors;
- mr.VolWrites = sdmr.VolWrites;
- mr.LastWritten = sdmr.LastWritten;
+ mr.VolJobs = sdmr.VolJobs;
+ mr.VolFiles = sdmr.VolFiles;
+ mr.VolBlocks = sdmr.VolBlocks;
+ mr.VolBytes = sdmr.VolBytes;
+ mr.VolMounts = sdmr.VolMounts;
+ mr.VolErrors = sdmr.VolErrors;
+ mr.VolWrites = sdmr.VolWrites;
+ mr.LastWritten = sdmr.LastWritten;
+ mr.Slot = sdmr.Slot;
+ mr.InChanger = sdmr.InChanger;
+ mr.VolReadTime = sdmr.VolReadTime;
+ mr.VolWriteTime = sdmr.VolWriteTime;
bstrncpy(mr.VolStatus, sdmr.VolStatus, sizeof(mr.VolStatus));
- mr.Slot = sdmr.Slot;
- /*
- * Update Media Record
+ Dmsg2(100, "db_update_media_record. Stat=%s Vol=%s\n", mr.VolStatus, mr.VolumeName);
+ /*
+ * Check if it has expired, and if not update the DB. Note, if
+ * Volume has expired, has_volume_expired() will update the DB.
*/
-
- /* Check limits and expirations if "Append" and not a relable request */
- if (strcmp(mr.VolStatus, "Append") == 0 && !relabel) {
- /* First handle Max Volume Bytes */
- if ((mr.MaxVolBytes > 0 && mr.VolBytes >= mr.MaxVolBytes)) {
- Jmsg(jcr, M_INFO, 0, _("Max Volume bytes exceeded. "
- "Marking Volume \"%s\" as Full.\n"), mr.VolumeName);
- strcpy(mr.VolStatus, "Full");
-
- /* Now see if Volume should only be used once */
- } else if (mr.VolBytes > 0 && jcr->pool->use_volume_once) {
- Jmsg(jcr, M_INFO, 0, _("Volume used once. "
- "Marking Volume \"%s\" as Used.\n"), mr.VolumeName);
- strcpy(mr.VolStatus, "Used");
-
- /* Now see if Max Jobs written to volume */
- } 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);
- strcpy(mr.VolStatus, "Used");
-
- /* Now see if Max Files written to volume */
- } else if (mr.MaxVolFiles > 0 && mr.MaxVolFiles <= mr.VolFiles) {
- Jmsg(jcr, M_INFO, 0, _("Max Volume files exceeded. "
- "Marking Volume \"%s\" as Used.\n"), mr.VolumeName);
- strcpy(mr.VolStatus, "Used");
-
- /* Finally, check Use duration expiration */
- } else if (mr.VolUseDuration > 0) {
- utime_t now = time(NULL);
- /* See if Vol Use has expired */
- if (mr.VolUseDuration <= (now - mr.FirstWritten)) {
- Jmsg(jcr, M_INFO, 0, _("Max configured use duration exceeded. "
- "Marking Volume \"%s\"as Used.\n"), mr.VolumeName);
- strcpy(mr.VolStatus, "Used"); /* yes, mark as used */
- }
- }
- }
- Dmsg2(200, "db_update_media_record. Stat=%s Vol=%s\n", mr.VolStatus, mr.VolumeName);
- if (db_update_media_record(jcr, jcr->db, &mr)) {
- bnet_fsend(bs, OK_update);
- Dmsg0(190, "send OK\n");
+ if (has_volume_expired(jcr, &mr)) {
+ send_volume_info_to_storage_daemon(jcr, bs, &mr);
+ } else if (db_update_media_record(jcr, jcr->db, &mr)) {
+ send_volume_info_to_storage_daemon(jcr, bs, &mr);
} else {
Jmsg(jcr, M_ERROR, 0, _("Catalog error updating Media record. %s"),
db_strerror(jcr->db));
bnet_fsend(bs, "1991 Update JobMedia error\n");
} else {
Dmsg0(100, "JobMedia record created\n");
- bnet_fsend(bs, OK_update);
+ bnet_fsend(bs, OK_create);
}
} else {
projects / bacula / bacula / blobdiff