goto bail_out;
}
Dmsg2(100, "=== dcr->dev=%p dev=%p\n", dcr->dev, dev);
-// dev = dcr->dev; /* may have changed in reserve volume */
/* Compare Volume Names */
Dmsg2(130, "Compare Vol names: VolName=%s hdr=%s\n", VolName?VolName:"*", dev->VolHdr.VolumeName);
dev->print_name());
return false;
} else {
- Dmsg1(130, "Wrote label of %d bytes to block\n", rec.data_len);
+ Dmsg2(130, "Wrote label of %d bytes to block. Vol=%s\n", rec.data_len,
+ dcr->VolumeName);
}
free_pool_memory(rec.data);
return true;
if (dev->open(dcr, OPEN_READ_WRITE) < 0) {
/* If device is not tape, attempt to create it */
if (dev->is_tape() || dev->open(dcr, CREATE_READ_WRITE) < 0) {
+ Jmsg3(dcr->jcr, M_WARNING, 0, _("Open device %s Volume \"%s\" failed: ERR=%s\n"),
+ dev->print_name(), dcr->VolumeName, dev->bstrerror());
goto bail_out;
}
}
JCR *jcr = dcr->jcr;
if (dev->open(dcr, OPEN_READ_WRITE) < 0) {
+ Jmsg3(jcr, M_WARNING, 0, _("Open device %s Volume \"%s\" failed: ERR=%s\n"),
+ dev->print_name(), dcr->VolumeName, dev->bstrerror());
return false;
}
Dmsg2(190, "set append found freshly labeled volume. fd=%d dev=%x\n", dev->fd(), dev);
Dmsg0(200, "Error from write volume label.\n");
return false;
}
+ Dmsg1(150, "wrote vol label to block. Vol=%s\n", dcr->VolumeName);
dev->VolCatInfo.VolCatBytes = 0; /* reset byte count */
return false;
}
if (recycle) {
- volume_unused(dcr); /* mark volume unused */
+ Dmsg1(150, "Doing recycle. Vol=%s\n", dcr->VolumeName);
+// volume_unused(dcr); /* mark volume unused */
if (!dev->truncate(dcr)) {
Jmsg2(jcr, M_FATAL, 0, _("Truncate error on device %s: ERR=%s\n"),
dev->print_name(), dev->print_errmsg());
dev->VolCatInfo.VolCatWrites = 1;
dev->VolCatInfo.VolCatReads = 1;
}
- Dmsg0(150, "dir_update_vol_info. Set Append\n");
+ Dmsg1(150, "dir_update_vol_info. Set Append vol=%s\n", dcr->VolumeName);
bstrncpy(dev->VolCatInfo.VolCatStatus, "Append", sizeof(dev->VolCatInfo.VolCatStatus));
+ bstrncpy(dev->VolCatInfo.VolCatName, dcr->VolumeName, sizeof(dev->VolCatInfo.VolCatName));
if (!dir_update_volume_info(dcr, true, true)) { /* indicate doing relabel */
return false;
}
* End writing real Volume label (from pre-labeled tape), or recycling
* the volume.
*/
- Dmsg0(200, "OK from rewrite vol label.\n");
+ Dmsg1(150, "OK from rewrite vol label. Vol=%s\n", dcr->VolumeName);
return true;
}
ser_string(dev->VolHdr.ProgDate);
ser_end(rec->data, SER_LENGTH_Volume_Label);
+ bstrncpy(dcr->VolumeName, dev->VolHdr.VolumeName, sizeof(dcr->VolumeName));
rec->data_len = ser_length(rec->data);
rec->FileIndex = dev->VolHdr.LabelType;
rec->VolSessionId = jcr->VolSessionId;