mount_next_vol:
Dmsg1(150, "mount_next_vol retry=%d\n", retry);
/* Ignore retry if this is poll request */
- if (!dev->poll && retry++ > 4) {
+ if (retry++ > 4) {
/* Last ditch effort before giving up, force operator to respond */
VolCatInfo.Slot = 0;
unlock_volumes();
if (dev->must_unload()) {
ask = true; /* ask operator to mount tape */
}
- unlock_volumes();
+// unlock_volumes();
do_unload();
do_swapping(true /*is_writing*/);
do_load(true /*is_writing*/);
- lock_volumes();
+// lock_volumes();
if (!find_a_volume()) {
goto no_lock_bail_out;
}
goto bail_out;
}
Dmsg3(150, "After find_next_append. Vol=%s Slot=%d Parts=%d\n",
- VolCatInfo.VolCatName, VolCatInfo.Slot, VolCatInfo.VolCatParts);
+ getVolCatName(), VolCatInfo.Slot, VolCatInfo.VolCatParts);
/*
* Get next volume and ready it for append
* and move the tape to the end of data.
*
*/
- unlock_volumes();
+// unlock_volumes();
+ dcr->setVolCatInfo(false); /* out of date when Vols unlocked */
if (autoload_device(dcr, true/*writing*/, NULL) > 0) {
autochanger = true;
ask = false;
VolCatInfo.Slot = 0;
ask = retry >= 2;
}
- lock_volumes();
+// lock_volumes();
Dmsg1(150, "autoload_dev returns %d\n", autochanger);
/*
* If we autochanged to correct Volume or (we have not just
if (ask) {
unlock_volumes();
+ dcr->setVolCatInfo(false); /* out of date when Vols unlocked */
if (!dir_ask_sysop_to_mount_volume(dcr, ST_APPEND)) {
Dmsg0(150, "Error return ask_sysop ...\n");
goto no_lock_bail_out;
case check_ok:
break;
}
+ /*
+ * Check that volcatinfo is good
+ */
+ if (!dev->haveVolCatInfo()) {
+ Dmsg0(100, "Do not have volcatinfo\n");
+ if (!find_a_volume()) {
+ goto mount_next_vol;
+ }
+ dev->VolCatInfo = VolCatInfo; /* structure assignment */
+ }
/*
* See if we have a fresh tape or a tape with data.
}
}
}
- return true;
+ if (dcr->haveVolCatInfo()) {
+ return true;
+ }
+ return dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE);
}
int DCR::check_volume_label(bool &ask, bool &autochanger)
Dmsg2(150, "Want dirVol=%s dirStat=%s\n", VolumeName,
VolCatInfo.VolCatStatus);
+
/*
* At this point, dev->VolCatInfo has what is in the drive, if anything,
* and dcr->VolCatInfo has what the Director wants.
Jmsg2(jcr, M_WARNING, 0, _("Could not reserve volume %s on %s\n"),
dev->VolHdr.VolumeName, dev->print_name());
ask = true;
+ dev->setVolCatInfo(false);
+ setVolCatInfo(false);
goto check_next_volume;
}
break; /* got a Volume */
return check_ok;
check_next_volume:
+ dev->setVolCatInfo(false);
+ setVolCatInfo(false);
return check_next_vol;
check_bail_out:
{
Jmsg(jcr, M_ERROR, 0, _("Autochanger Volume \"%s\" not found in slot %d.\n"
" Setting InChanger to zero in catalog.\n"),
- VolCatInfo.VolCatName, VolCatInfo.Slot);
+ getVolCatName(), VolCatInfo.Slot);
dev->VolCatInfo = VolCatInfo; /* structure assignment */
VolCatInfo.InChanger = false;
dev->VolCatInfo.InChanger = false;