static int do_request_volume_info(JCR *jcr)
{
BSOCK *dir = jcr->dir_bsock;
- VOLUME_CAT_INFO *vol = &jcr->VolCatInfo;
+ VOLUME_CAT_INFO vol;
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,
- &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) {
+ if (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);
return 0;
}
- unbash_spaces(vol->VolCatName);
- pm_strcpy(&jcr->VolumeName, vol->VolCatName); /* set desired VolumeName */
+ unbash_spaces(vol.VolCatName);
+ pm_strcpy(&jcr->VolumeName, vol.VolCatName); /* set desired VolumeName */
+ memcpy(&jcr->VolCatInfo, &vol, sizeof(jcr->VolCatInfo));
Dmsg2(200, "do_reqest_vol_info got slot=%d Volume=%s\n",
- vol->Slot, vol->VolCatName);
+ vol.Slot, vol.VolCatName);
return 1;
}
*
* Volume information returned in jcr
*/
-int dir_get_volume_info(JCR *jcr, int writing)
+int dir_get_volume_info(JCR *jcr, enum get_vol_info_rw writing)
{
BSOCK *dir = jcr->dir_bsock;
- strcpy(jcr->VolCatInfo.VolCatName, jcr->VolumeName);
+ bstrncpy(jcr->VolCatInfo.VolCatName, jcr->VolumeName, sizeof(jcr->VolCatInfo.VolCatName));
Dmsg1(200, "dir_get_volume_info=%s\n", jcr->VolCatInfo.VolCatName);
bash_spaces(jcr->VolCatInfo.VolCatName);
- bnet_fsend(dir, Get_Vol_Info, jcr->Job, jcr->VolCatInfo.VolCatName, writing);
+ 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);
}
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: %s\n"),
- bnet_strerror(dir));
+ 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: %s\n"), dir->msg);
+ Jmsg(jcr, M_ERROR, 0, _("Error updating Volume info Vol=\"%s\": %s\n"),
+ vol->VolCatName, dir->msg);
return 0;
}
return 1;
{
BSOCK *dir = jcr->dir_bsock;
+ if (!jcr->WroteVol) {
+ return 1; /* nothing written to tape */
+ }
+
+ jcr->WroteVol = false;
bnet_fsend(dir, Create_job_media, jcr->Job,
- jcr->VolFirstFile, jcr->JobFiles,
+ jcr->VolFirstIndex, jcr->VolLastIndex,
jcr->StartFile, jcr->EndFile,
jcr->StartBlock, jcr->EndBlock);
Dmsg1(100, "create_jobmedia(): %s", dir->msg);
if (bnet_recv(dir) <= 0) {
Dmsg0(190, "create_jobmedia error bnet_recv\n");
- Jmsg(jcr, M_ERROR, 0, _("Error creating JobMedia record: %s\n"),
+ Jmsg(jcr, M_ERROR, 0, _("Error creating JobMedia record: ERR=%s\n"),
bnet_strerror(dir));
return 0;
}
if (job_canceled(jcr)) {
Mmsg(&dev->errmsg, _("Job %s canceled while waiting for mount on Storage Device \"%s\".\n"),
jcr->Job, jcr->dev_name);
- Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg);
+ Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg);
return 0;
}
if (dir_find_next_appendable_volume(jcr)) { /* get suggested volume */
Mmsg(&dev->errmsg, _("Gave up waiting to mount Storage Device \"%s\" for Job %s\n"),
jcr->dev_name, jcr->Job);
Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg);
- Dmsg1(190, "Gave up waiting on device %s\n", dev->dev_name);
+ Dmsg1(190, "Gave up waiting on device %s\n", dev_name(dev));
return 0; /* exceeded maximum waits */
}
continue;
Jmsg(jcr, M_WARNING, 0, _("pthread error in mount_next_volume stat=%d ERR=%s\n"), stat,
strerror(stat));
}
- Dmsg1(190, "Someone woke me for device %s\n", dev->dev_name);
+ Dmsg1(190, "Someone woke me for device %s\n", dev_name(dev));
/* Restart wait counters */
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)) {
+ !dir_find_next_appendable_volume(jcr) && !job_canceled(jcr)) {
Jmsg(jcr, M_MOUNT, 0, _(
"Someone woke me up, but I cannot find any appendable\n\
volumes for Job=%s.\n"), jcr->Job);
Mmsg(&dev->errmsg, _("Gave up waiting to mount Storage Device \"%s\" for Job %s\n"),
jcr->dev_name, jcr->Job);
Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg);
- Dmsg1(190, "Gave up waiting on device %s\n", dev->dev_name);
+ Dmsg1(190, "Gave up waiting on device %s\n", dev_name(dev));
return 0; /* exceeded maximum waits */
}
continue;
Jmsg(jcr, M_ERROR, 0, _("pthread error in mount_next_volume stat=%d ERR=%s\n"), stat,
strerror(stat));
}
- Dmsg1(190, "Someone woke me for device %s\n", dev->dev_name);
+ Dmsg1(190, "Someone woke me for device %s\n", dev_name(dev));
/* Restart wait counters */
wait_sec = min_wait;
for ( ; !job_canceled(jcr); ) {
time_t now;
- Dmsg3(100, "I'm going to sleep on device %s. HB=%d wait=%d\n", dev->dev_name,
+ Dmsg3(100, "I'm going to sleep on device %s. HB=%d wait=%d\n", dev_name(dev),
(int)me->heartbeat_interval, wait_sec);
stat = pthread_cond_timedwait(&dev->wait_next_vol, &dev->mutex, &timeout);
Dmsg1(100, "Wokeup from sleep on device stat=%d\n", stat);