- /* *****FIXME**** we should do some checking for files too */
- if (dev_is_tape(dev)) {
- /*
- * Check if we are positioned on the tape at the same place
- * that the database says we should be.
- */
- if (dev->VolCatInfo.VolCatFiles == dev_file(dev)) {
- Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\" at file=%d.\n"),
- jcr->VolumeName, dev_file(dev));
- } else {
- Jmsg(jcr, M_ERROR, 0, _("I canot write on Volume \"%s\" because:\n\
-The number of files mismatch! Volume=%u Catalog=%u\n"),
- jcr->VolumeName, dev_file(dev), dev->VolCatInfo.VolCatFiles);
- mark_volume_in_error(jcr, dev);
- goto mount_next_vol;
- }
+ if (dev->is_dvd()) {
+ char ed1[50], ed2[50];
+ if (dev->VolCatInfo.VolCatBytes == dev->part_start + dev->part_size) {
+ Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\""
+ " part=%d size=%s\n"), dcr->VolumeName,
+ dev->part, edit_uint64(dev->VolCatInfo.VolCatBytes,ed1));
+ } else {
+ Jmsg(jcr, M_ERROR, 0, _("I cannot write on DVD Volume \"%s\" because: "
+ "The sizes do not match! Volume=%s Catalog=%s\n"),
+ dcr->VolumeName,
+ edit_uint64(dev->part_start + dev->part_size, ed1),
+ edit_uint64(dev->VolCatInfo.VolCatBytes, ed2));
+ mark_volume_in_error(dcr);
+ goto mount_next_vol;
+ }
+ } else if (dev->is_tape()) {
+ /*
+ * Check if we are positioned on the tape at the same place
+ * that the database says we should be.
+ */
+ if (dev->VolCatInfo.VolCatFiles == dev->get_file()) {
+ Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\" at file=%d.\n"),
+ dcr->VolumeName, dev->get_file());
+ } else {
+ Jmsg(jcr, M_ERROR, 0, _("I cannot write on tape Volume \"%s\" because:\n"
+ "The number of files mismatch! Volume=%u Catalog=%u\n"),
+ dcr->VolumeName, dev->get_file(), dev->VolCatInfo.VolCatFiles);
+ mark_volume_in_error(dcr);
+ goto mount_next_vol;
+ }
+ } else if (dev->is_file()) {
+ char ed1[50], ed2[50];
+ boffset_t pos;
+ pos = dev->lseek(dcr, (boffset_t)0, SEEK_END);
+ if (dev->VolCatInfo.VolCatBytes == (uint64_t)pos) {
+ Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\""
+ " size=%s\n"), dcr->VolumeName,
+ edit_uint64(dev->VolCatInfo.VolCatBytes, ed1));
+ } else {
+ Jmsg(jcr, M_ERROR, 0, _("I cannot write on disk Volume \"%s\" because: "
+ "The sizes do not match! Volume=%s Catalog=%s\n"),
+ dcr->VolumeName,
+ edit_uint64(pos, ed1),
+ edit_uint64(dev->VolCatInfo.VolCatBytes, ed2));
+ mark_volume_in_error(dcr);
+ goto mount_next_vol;
+ }
+ }
+ dev->VolCatInfo.VolCatMounts++; /* Update mounts */
+ Dmsg1(150, "update volinfo mounts=%d\n", dev->VolCatInfo.VolCatMounts);
+ if (!dir_update_volume_info(dcr, false)) {
+ return false;
+ }
+
+ /*
+ * DVD : check if the last part was removed or truncated, or if a written
+ * part was overwritten.
+ * We need to do it after dir_update_volume_info, so we have the EndBlock
+ * info. (nb: I don't understand why VolCatFiles is set (used to check
+ * tape file number), but not EndBlock)
+ * Maybe could it be changed "dev->is_file()" (would remove the fixme above)
+ *
+ * Disabled: I had problems with this code...
+ * (maybe is it related to the seek bug ?)
+ */
+#ifdef xxx
+ if (dev->is_dvd()) {
+ Dmsg2(150, "DVD/File sanity check addr=%u vs endblock=%u\n", (unsigned int)dev->file_addr, (unsigned int)dev->VolCatInfo.EndBlock);
+ if (dev->file_addr == dev->VolCatInfo.EndBlock+1) {
+ Jmsg(jcr, M_INFO, 0, _("Ready to append to end of Volume \"%s\" at file address=%u.\n"),
+ dcr->VolumeName, (unsigned int)dev->file_addr);
+ }
+ else {
+ Jmsg(jcr, M_ERROR, 0, _("I cannot write on Volume \"%s\" because:\n"
+ "The EOD file address is wrong: Volume file address=%u != Catalog Endblock=%u(+1)\n"
+ "You probably removed DVD last part in spool directory.\n"),
+ dcr->VolumeName, (unsigned int)dev->file_addr, (unsigned int)dev->VolCatInfo.EndBlock);
+ mark_volume_in_error(dcr);
+ goto mount_next_vol;
+ }