/* Requests sent to the Director */
static char Find_media[] = "CatReq Job=%s FindMedia=%d\n";
static char Get_Vol_Info[] = "CatReq Job=%s GetVolInfo VolName=%s write=%d\n";
-static char Update_media[] = "CatReq Job=%s UpdateMedia VolName=%s\
- VolJobs=%u VolFiles=%u VolBlocks=%u VolBytes=%s VolMounts=%u\
- VolErrors=%u VolWrites=%u MaxVolBytes=%s EndTime=%d VolStatus=%s\
- Slot=%d relabel=%d\n";
-
-static char Create_job_media[] = "CatReq Job=%s CreateJobMedia \
- FirstIndex=%u LastIndex=%u StartFile=%u EndFile=%u \
- StartBlock=%u EndBlock=%u\n";
+static char Update_media[] = "CatReq Job=%s UpdateMedia VolName=%s"
+ " VolJobs=%u VolFiles=%u VolBlocks=%u VolBytes=%s VolMounts=%u"
+ " VolErrors=%u VolWrites=%u MaxVolBytes=%s EndTime=%d VolStatus=%s"
+ " Slot=%d relabel=%d InChanger=%d VolReadTime=%s VolWriteTime=%s\n";
+static char Create_job_media[] = "CatReq Job=%s CreateJobMedia"
+ " FirstIndex=%u LastIndex=%u StartFile=%u EndFile=%u"
+ " StartBlock=%u EndBlock=%u\n";
static char FileAttributes[] = "UpdCat Job=%s FileAttributes ";
static char Job_status[] = "3012 Job %s jobstatus %d\n";
/* Responses received from the Director */
-static char OK_media[] = "1000 OK VolName=%127s VolJobs=%u VolFiles=%u\
- VolBlocks=%u VolBytes=%" lld " VolMounts=%u VolErrors=%u VolWrites=%u\
- MaxVolBytes=%" lld " VolCapacityBytes=%" lld " VolStatus=%20s\
- Slot=%d MaxVolJobs=%u MaxVolFiles=%u\n";
-static char OK_update[] = "1000 OK UpdateMedia\n";
+static char OK_media[] = "1000 OK VolName=%127s VolJobs=%u VolFiles=%u"
+ " VolBlocks=%u VolBytes=%" lld " VolMounts=%u VolErrors=%u VolWrites=%u"
+ " MaxVolBytes=%" lld " VolCapacityBytes=%" lld " VolStatus=%20s"
+ " Slot=%d MaxVolJobs=%u MaxVolFiles=%u InChanger=%d"
+ " VolReadTime=%" lld " VolWriteTime=%" lld;
+
+
+static char OK_create[] = "1000 OK CreateJobMedia\n";
/* Forward referenced functions */
static int wait_for_sysop(JCR *jcr, DEVICE *dev, int wait_sec);
* dir_get_volume_info()
* and
* dir_find_next_appendable_volume()
+ *
+ * Returns: 1 on success and vol info in jcr->VolCatInfo
+ * 0 on failure
*/
-static int do_request_volume_info(JCR *jcr)
+static int do_get_volume_info(JCR *jcr)
{
BSOCK *dir = jcr->dir_bsock;
VOLUME_CAT_INFO vol;
+ int n;
jcr->VolumeName[0] = 0; /* No volume */
if (bnet_recv(dir) <= 0) {
Mmsg(&jcr->errmsg, _("Network error on bnet_recv in req_vol_info.\n"));
return 0;
}
- if (sscanf(dir->msg, OK_media, vol.VolCatName,
+ memset(&vol, 0, sizeof(vol));
+ Dmsg1(200, "Get vol info=%s\n", dir->msg);
+ n = sscanf(dir->msg, OK_media, vol.VolCatName,
&vol.VolCatJobs, &vol.VolCatFiles,
&vol.VolCatBlocks, &vol.VolCatBytes,
&vol.VolCatMounts, &vol.VolCatErrors,
&vol.VolCatWrites, &vol.VolCatMaxBytes,
&vol.VolCatCapacityBytes, vol.VolCatStatus,
- &vol.Slot, &vol.VolCatMaxJobs, &vol.VolCatMaxFiles) != 14) {
-
- Dmsg1(200, "Bad response from Dir: %s\n", dir->msg);
- Mmsg(&jcr->errmsg, _("Error scanning Dir response: %s\n"), dir->msg);
+ &vol.Slot, &vol.VolCatMaxJobs, &vol.VolCatMaxFiles,
+ &vol.InChanger, &vol.VolReadTime, &vol.VolWriteTime);
+ if (n != 17) {
+ Dmsg2(100, "Bad response from Dir fields=%d: %s\n", n, dir->msg);
+ Mmsg(&jcr->errmsg, _("Error getting Volume info: %s\n"), dir->msg);
return 0;
}
unbash_spaces(vol.VolCatName);
bash_spaces(jcr->VolCatInfo.VolCatName);
bnet_fsend(dir, Get_Vol_Info, jcr->Job, jcr->VolCatInfo.VolCatName,
writing==GET_VOL_INFO_FOR_WRITE?1:0);
- return do_request_volume_info(jcr);
+ return do_get_volume_info(jcr);
}
Dmsg0(200, "dir_find_next_appendable_volume\n");
bnet_fsend(dir, Find_media, jcr->Job, 1);
- return do_request_volume_info(jcr);
+ return do_get_volume_info(jcr);
}
* After writing a Volume, send the updated statistics
* back to the director.
*/
-int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel)
+int dir_update_volume_info(JCR *jcr, DEVICE *dev, int label)
{
BSOCK *dir = jcr->dir_bsock;
time_t EndTime = time(NULL);
- char ed1[50], ed2[50];
+ char ed1[50], ed2[50], ed3[50], ed4[50];
+ VOLUME_CAT_INFO *vol = &dev->VolCatInfo;
if (vol->VolCatName[0] == 0) {
Jmsg0(jcr, M_ERROR, 0, _("NULL Volume name. This shouldn't happen!!!\n"));
return 0;
}
+ if (dev_state(dev, ST_READ)) {
+ Jmsg0(jcr, M_ERROR, 0, _("Attempt to update_volume_info in read mode!!!\n"));
+ return 0;
+ }
+ if (!dev_state(dev, ST_LABEL)) {
+ Jmsg0(jcr, M_ERROR, 0, _("Attempt to update_volume_info on non-labeled Volume!!!\n"));
+ return 0;
+ }
+
+ Dmsg1(100, "Update cat VolFiles=%d\n", dev->file);
+ /* Just labeled or relabeled the tape */
+ if (label) {
+ bstrncpy(vol->VolCatStatus, "Append", sizeof(vol->VolCatStatus));
+ vol->VolCatBytes = 1; /* indicates tape labeled */
+ }
bash_spaces(vol->VolCatName);
bnet_fsend(dir, Update_media, jcr->Job,
vol->VolCatName, vol->VolCatJobs, vol->VolCatFiles,
vol->VolCatBlocks, edit_uint64(vol->VolCatBytes, ed1),
vol->VolCatMounts, vol->VolCatErrors,
vol->VolCatWrites, edit_uint64(vol->VolCatMaxBytes, ed2),
- EndTime, vol->VolCatStatus, vol->Slot, relabel);
- Dmsg1(120, "update_volume_data(): %s", dir->msg);
+ EndTime, vol->VolCatStatus, vol->Slot, label,
+ vol->InChanger,
+ edit_uint64(vol->VolReadTime, ed3),
+ edit_uint64(vol->VolWriteTime, ed4) );
+
+ Dmsg1(120, "update_volume_info(): %s", dir->msg);
unbash_spaces(vol->VolCatName);
- if (bnet_recv(dir) <= 0) {
- Dmsg0(190, "updateVolCatInfo error bnet_recv\n");
- Jmsg(jcr, M_ERROR, 0, _("Error updating Volume info Vol=\"%s\": ERR=%s\n"),
- vol->VolCatName, bnet_strerror(dir));
- return 0;
- }
- Dmsg1(120, "Updatevol: %s", dir->msg);
- if (strcmp(dir->msg, OK_update) != 0) {
- Dmsg1(130, "Bad response from Dir: %s\n", dir->msg);
- Jmsg(jcr, M_ERROR, 0, _("Error updating Volume info Vol=\"%s\": %s\n"),
- vol->VolCatName, dir->msg);
+
+ if (!do_get_volume_info(jcr)) {
+ Jmsg(jcr, M_ERROR, 0, "%s", jcr->errmsg);
return 0;
}
+ Dmsg1(120, "get_volume_info(): %s", dir->msg);
+ /* Update dev Volume info in case something changed (e.g. expired) */
+ memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(dev->VolCatInfo));
return 1;
}
return 0;
}
Dmsg1(120, "Create_jobmedia: %s", dir->msg);
- if (strcmp(dir->msg, OK_update) != 0) {
+ if (strcmp(dir->msg, OK_create) != 0) {
Dmsg1(130, "Bad response from Dir: %s\n", dir->msg);
Jmsg(jcr, M_ERROR, 0, _("Error creating JobMedia record: %s\n"), dir->msg);
return 0;
/*
- *
+ * Request to mount next Volume, which Volume not specified
+ *
* Entered with device blocked.
* Leaves with device blocked.
*
jstat = JS_WaitMount;
/*
* If we have a valid volume name and we are not
- * removable media, return now, otherwise wait
- * for the operator to mount the media.
+ * removable media, return now, or if we have a
+ * Slot for an autochanger, otherwise wait
+ * for the operator to mount the media.
*/
- if (jcr->VolumeName[0] && !dev_cap(dev, CAP_REM) && dev_cap(dev, CAP_LABEL)) {
- Dmsg0(190, "Return 1 from mount without wait.\n");
+ if ((jcr->VolumeName[0] && !dev_cap(dev, CAP_REM) && dev_cap(dev, CAP_LABEL)) ||
+ (jcr->VolumeName[0] && jcr->VolCatInfo.Slot)) {
+ Dmsg0(100, "Return 1 from mount without wait.\n");
return 1;
}
Jmsg(jcr, M_MOUNT, 0, _(
wait_sec = min_wait;
num_wait = 0;
/* If no VolumeName, and cannot get one, try again */
- if (jcr->VolumeName[0] == 0 &&
- !dir_find_next_appendable_volume(jcr) && !job_canceled(jcr)) {
+ if (jcr->VolumeName[0] == 0 && !job_canceled(jcr) &&
+ !dir_find_next_appendable_volume(jcr)) {
Jmsg(jcr, M_MOUNT, 0, _(
"Someone woke me up, but I cannot find any appendable\n\
volumes for Job=%s.\n"), jcr->Job);
}
/*
- *
+ * Request to mount specific Volume
+ *
* Entered with device blocked and jcr->VolumeName is desired
* volume.
* Leaves with device blocked.
Dmsg1(100, "Additional wait %d sec.\n", add_wait);
}
- dev->dev_blocked = dev_blocked;
+ dev->dev_blocked = dev_blocked; /* restore entry state */
V(dev->mutex);
return stat;
}
projects / bacula / bacula / blobdiff