{
pm_strcpy(archive_name, dev->device->mount_point);
add_file_and_part_name(dev, archive_name);
- dev->set_part_spooled(false);
}
void make_spooled_dvd_filename(DEVICE *dev, POOL_MEM &archive_name)
pm_strcpy(archive_name, working_directory);
}
add_file_and_part_name(dev, archive_name);
- dev->set_part_spooled(true);
}
static void add_file_and_part_name(DEVICE *dev, POOL_MEM &archive_name)
{
char partnumber[20];
+
if (archive_name.c_str()[strlen(archive_name.c_str())-1] != '/') {
pm_strcat(archive_name, "/");
}
pm_strcat(archive_name, dev->VolCatInfo.VolCatName);
/* if part > 1, append .# to the filename (where # is the part number) */
- if (dev->part > 0) {
+ if (dev->part > 1) {
pm_strcat(archive_name, ".");
bsnprintf(partnumber, sizeof(partnumber), "%d", dev->part);
pm_strcat(archive_name, partnumber);
}
- Dmsg1(100, "Exit make_dvd_filename: arch=%s\n", archive_name.c_str());
+ Dmsg2(400, "Exit add_file_part_name: arch=%s, part=%d\n",
+ archive_name.c_str(), dev->part);
}
/* Mount the device.
icmd = dev->device->unmount_command;
}
+ dev->clear_freespace_ok();
dev->edit_mount_codes(ocmd, icmd);
Dmsg2(200, "do_mount_dvd: cmd=%s mounted=%d\n", ocmd.c_str(), !!dev->is_mounted());
results = get_memory(2000);
results[0] = 0;
/* If busy retry each second */
+ Dmsg1(20, "Run mount prog=%s\n", ocmd.c_str());
while ((status = run_program_full_output(ocmd.c_str(),
dev->max_open_wait/2, results)) != 0) {
- /* Doesn't work with internationalisation (This is not a problem) */
- if (fnmatch("*is already mounted on", results, 0) == 0) {
+ Dmsg2(20, "Mount status=%d result=%s\n", status, results);
+ /* Doesn't work with internationalization (This is not a problem) */
+ if (mount && fnmatch("*is already mounted on*", results, 0) == 0) {
+ break;
+ }
+ if (!mount && fnmatch("* not mounted*", results, 0) == 0) {
break;
}
if (timeout-- > 0) {
bmicrosleep(1, 0);
continue;
}
- Dmsg2(40, "Device %s cannot be mounted. ERR=%s\n", dev->print_name(), results);
- Mmsg(dev->errmsg, _("Device %s cannot be mounted. ERR=%s\n"),
- dev->print_name(), results);
+ if (status != 0) {
+ berrno be;
+ Dmsg5(40, "Device %s cannot be %smounted. stat=%d result=%s ERR=%s\n", dev->print_name(),
+ (mount ? "" : "un"), status, results, be.strerror(status));
+ Mmsg(dev->errmsg, _("Device %s cannot be %smounted. ERR=%s\n"),
+ dev->print_name(), (mount ? "" : "un"), be.strerror(status));
+ } else {
+ Dmsg4(40, "Device %s cannot be %smounted. stat=%d ERR=%s\n", dev->print_name(),
+ (mount ? "" : "un"), status, results);
+ Mmsg(dev->errmsg, _("Device %s cannot be %smounted. ERR=%s\n"),
+ dev->print_name(), (mount ? "" : "un"), results);
+ }
/*
* Now, just to be sure it is not mounted, try to read the
* filesystem.
if (strcmp(result->d_name, ".") && strcmp(result->d_name, "..") &&
strcmp(result->d_name, ".keep")) {
count++; /* result->d_name != ., .. or .keep (Gentoo-specific) */
+ Dmsg1(100, "Inc count=%d\n", count);
break;
- }
- else {
+ } else {
Dmsg2(129, "do_mount_dvd: ignoring %s in %s\n",
result->d_name, dev->device->mount_point);
}
Dmsg1(29, "do_mount_dvd: got %d files in the mount point (not counting ., .. and .keep)\n", count);
if (count > 0) {
- mount = 1; /* If we got more than ., .. and .keep */
- break; /* there must be something mounted */
+ /* If we got more than ., .. and .keep */
+ /* there must be something mounted */
+ if (mount) {
+ Dmsg1(100, "Did Mount by count=%d\n", count);
+ break;
+ } else {
+ /* An unmount request. We failed to unmount - report an error */
+ dev->set_mounted(true);
+ free_pool_memory(results);
+ Dmsg0(200, "== DVD mount=1\n");
+ return false;
+ }
}
get_out:
dev->set_mounted(false);
sm_check(__FILE__, __LINE__, false);
free_pool_memory(results);
- Dmsg0(200, "============ DVD mount=0\n");
+ Dmsg0(200, "== DVD mount=0\n");
return false;
}
+ Dmsg0(100, "Out of mount/umount loop\n");
dev->set_mounted(mount); /* set/clear mounted flag */
free_pool_memory(results);
/* Do not check free space when unmounting */
if (mount) {
- update_free_space_dev(dev);
+ Dmsg0(100, "Calling update_free_space\n");
+ if (!update_free_space_dev(dev)) {
+ return false;
+ }
}
- Dmsg1(200, "============ DVD mount=%d\n", mount);
+ Dmsg1(200, "== DVD mount=%d\n", mount);
return true;
}
/* Update the free space on the device */
-void update_free_space_dev(DEVICE* dev)
+bool update_free_space_dev(DEVICE* dev)
{
POOL_MEM ocmd(PM_FNAME);
POOLMEM* results;
char* icmd;
int timeout;
- long long int free;
+ uint64_t free;
char ed1[50];
+ bool ok = false;
+ int status;
+
+ if (!dev->is_dvd() || dev->is_freespace_ok()) {
+ return true;
+ }
/* The device must be mounted in order to dvd-freespace to work */
mount_dvd(dev, 1);
if (!icmd) {
dev->free_space = 0;
dev->free_space_errno = 0;
- dev->clear_freespace_ok(); /* No valid freespace */
+ dev->clear_freespace_ok(); /* No valid freespace */
dev->clear_media();
- Dmsg2(29, "update_free_space_dev: free_space=%s, free_space_errno=%d (!icmd)\n",
+ Dmsg2(29, "ERROR: update_free_space_dev: free_space=%s, free_space_errno=%d (!icmd)\n",
edit_uint64(dev->free_space, ed1), dev->free_space_errno);
- return;
+ Mmsg(dev->errmsg, _("No FreeSpace command defined.\n"));
+ return false;
}
dev->edit_mount_codes(ocmd, icmd);
timeout = 3;
while (1) {
- if (run_program_full_output(ocmd.c_str(), dev->max_open_wait/2, results) == 0) {
- Dmsg1(100, "Free space program run : %s\n", results);
+ berrno be;
+ Dmsg1(20, "Run freespace prog=%s\n", ocmd.c_str());
+ status = run_program_full_output(ocmd.c_str(), dev->max_open_wait/2, results);
+ Dmsg2(500, "Freespace status=%d result=%s\n", status, results);
+ if (status == 0) {
free = str_to_int64(results);
+ Dmsg1(400, "Free space program run: Freespace=%s\n", results);
if (free >= 0) {
dev->free_space = free;
dev->free_space_errno = 0;
dev->set_freespace_ok(); /* have valid freespace */
dev->set_media();
- Mmsg0(dev->errmsg, "");
+ Mmsg(dev->errmsg, "");
+ ok = true;
break;
}
}
dev->free_space = 0;
dev->free_space_errno = EPIPE;
dev->clear_freespace_ok(); /* no valid freespace */
- Mmsg1(dev->errmsg, _("Cannot run free space command (%s)\n"), results);
+ Mmsg2(dev->errmsg, _("Cannot run free space command. Results=%s ERR=%s\n"),
+ results, be.strerror(status));
if (--timeout > 0) {
Dmsg4(40, "Cannot get free space on device %s. free_space=%s, "
}
free_pool_memory(results);
- Dmsg4(29, "update_free_space_dev: free_space=%s freespace_ok=%d free_space_errno=%d have_media=%d\n",
+ Dmsg4(29, "leave update_free_space_dev: free_space=%s freespace_ok=%d free_space_errno=%d have_media=%d\n",
edit_uint64(dev->free_space, ed1), !!dev->is_freespace_ok(), dev->free_space_errno, !!dev->have_media());
sm_check(__FILE__, __LINE__, false);
- return;
+ return ok;
}
/*
- * Write a part (Vol, Vol.1, ...) from the spool to the DVD
+ * Note!!!! Part numbers now begin at 1. The part number is
+ * suppressed from the first part, which is just the Volume
+ * name. Each subsequent part is the Volumename.partnumber.
+ *
+ * Write a part (Vol, Vol.2, ...) from the spool to the DVD
* This routine does not update the part number, so normally, you
* should call open_next_part()
+ *
* It is also called from truncate_dvd to "blank" the medium, as
* well as from block.c when the DVD is full to write the last part.
*/
-bool dvd_write_part(DCR *dcr)
+bool dvd_write_part(DCR *dcr)
{
DEVICE *dev = dcr->dev;
POOL_MEM archive_name(PM_FNAME);
- /* Don't write empty part files.
+ /*
+ * Don't write empty part files.
* This is only useful when growisofs does not support write beyond
* the 4GB boundary.
* Example :
* There is one exception: when recycling a volume, we write a blank part
* file, so, then, we need to accept to write it.
*/
- if ((dev->part_size == 0) && (dev->part > 0)) {
+ if (dev->part_size == 0 && !dev->truncating) {
Dmsg2(29, "dvd_write_part: device is %s, won't write blank part %d\n", dev->print_name(), dev->part);
/* Delete spool file */
make_spooled_dvd_filename(dev, archive_name);
unlink(archive_name.c_str());
- Dmsg1(29, "unlink(%s)\n", archive_name.c_str());
+ dev->set_part_spooled(false);
+ Dmsg1(29, "========= unlink(%s)\n", archive_name.c_str());
sm_check(__FILE__, __LINE__, false);
return true;
}
int timeout;
char ed1[50];
+ dev->clear_freespace_ok(); /* need to update freespace */
+
sm_check(__FILE__, __LINE__, false);
Dmsg3(29, "dvd_write_part: device is %s, part is %d, is_mounted=%d\n", dev->print_name(), dev->part, dev->is_mounted());
icmd = dev->device->write_part_command;
* in case of a serious emergency.
*/
- if (dev->part == 0)
+ if (dev->part == 1) {
timeout = 16000;
- else
+ } else {
timeout = dev->max_open_wait + (dev->part_size/(1350*1024/4));
+ }
- Dmsg2(29, "dvd_write_part: cmd=%s timeout=%d\n", ocmd.c_str(), timeout);
-
+ Dmsg2(20, "Write part: cmd=%s timeout=%d\n", ocmd.c_str(), timeout);
status = run_program_full_output(ocmd.c_str(), timeout, results.c_str());
+ Dmsg2(20, "Write part status=%d result=%s\n", status, results.c_str());
+
+ dev->blank_dvd = false;
if (status != 0) {
+ Jmsg2(dcr->jcr, M_FATAL, 0, _("Error writing part %d to the DVD: ERR=%s\n"),
+ dev->part, results.c_str());
Mmsg1(dev->errmsg, _("Error while writing current part to the DVD: %s"),
results.c_str());
- Dmsg1(000, "%s", dev->errmsg);
+ Dmsg1(100, "%s\n", dev->errmsg);
dev->dev_errno = EIO;
- mark_volume_in_error(dcr);
+ if (!dev->truncating) {
+ mark_volume_in_error(dcr);
+ }
sm_check(__FILE__, __LINE__, false);
return false;
- } else {
- dev->num_parts++; /* there is now one more part on DVD */
}
+ Jmsg(dcr->jcr, M_INFO, 0, _("Part %d (%lld bytes) written to DVD.\n"), dev->part, dev->part_size);
+ Dmsg3(400, "dvd_write_part: Part %d (%lld bytes) written to DVD\nResults: %s\n",
+ dev->part, dev->part_size, results.c_str());
+
+ dev->num_dvd_parts++; /* there is now one more part on DVD */
+ dev->VolCatInfo.VolCatParts = dev->num_dvd_parts;
+ dcr->VolCatInfo.VolCatParts = dev->num_dvd_parts;
+ Dmsg1(100, "Update num_parts=%d\n", dev->num_dvd_parts);
/* Delete spool file */
make_spooled_dvd_filename(dev, archive_name);
unlink(archive_name.c_str());
- Dmsg1(29, "unlink(%s)\n", archive_name.c_str());
+ dev->set_part_spooled(false);
+ Dmsg1(29, "========= unlink(%s)\n", archive_name.c_str());
sm_check(__FILE__, __LINE__, false);
/* growisofs umounted the device, so remount it (it will update the free space) */
return true;
}
-/* Open the next part file.
+/*
+ * Open the next part file.
* - Close the fd
* - Increment part number
* - Reopen the device
{
DEVICE *dev = dcr->dev;
- Dmsg6(29, "Enter: ==== open_next_part part=%d npart=%d dev=%s vol=%s mode=%d file_addr=%d\n",
- dev->part, dev->num_parts, dev->print_name(),
+ Dmsg6(29, "Enter: == open_next_part part=%d npart=%d dev=%s vol=%s mode=%d file_addr=%d\n",
+ dev->part, dev->num_dvd_parts, dev->print_name(),
dev->VolCatInfo.VolCatName, dev->openmode, dev->file_addr);
if (!dev->is_dvd()) {
- Dmsg1(000, "Device %s is not dvd!!!!\n", dev->print_name());
+ Dmsg1(100, "Device %s is not dvd!!!!\n", dev->print_name());
return -1;
}
/* When appending, do not open a new part if the current is empty */
- if (dev->can_append() && (dev->part >= dev->num_parts) &&
+ if (dev->can_append() && (dev->part > dev->num_dvd_parts) &&
(dev->part_size == 0)) {
Dmsg0(29, "open_next_part exited immediately (dev->part_size == 0).\n");
return dev->fd;
}
-
- if (dev->fd >= 0) {
- close(dev->fd);
- }
-
- dev->fd = -1;
- dev->clear_opened();
+
+ dev->close_part(dcr); /* close current part */
/*
- * If we have a part open for write, then write it to
+ * If we have a spooled part open, write it to the
* DVD before opening the next part.
*/
- if (dev->is_dvd() && (dev->part >= dev->num_parts) && dev->can_append()) {
+ if (dev->is_part_spooled()) {
+ Dmsg2(100, "Before open next write previous. part=%d num_parts=%d\n",
+ dev->part, dev->num_dvd_parts);
if (!dvd_write_part(dcr)) {
Dmsg0(29, "Error in dvd_write part.\n");
return -1;
}
}
- if (dev->part > dev->num_parts) {
- Dmsg2(000, "In open_next_part: part=%d nump=%d\n", dev->part, dev->num_parts);
- ASSERT(dev->part <= dev->num_parts);
- }
dev->part_start += dev->part_size;
dev->part++;
-
- Dmsg2(29, "part=%d num_parts=%d\n", dev->part, dev->num_parts);
- /* I think this dev->can_append() should not be there */
- if ((dev->num_parts < dev->part) && dev->can_append()) {
+ Dmsg2(29, "Inc part=%d num_dvd_parts=%d\n", dev->part, dev->num_dvd_parts);
+
+ /* Are we working on a part past what is written in the DVD? */
+ if (dev->num_dvd_parts < dev->part) {
POOL_MEM archive_name(PM_FNAME);
struct stat buf;
/*
* First check what is on DVD. If our part is there, we
* are in trouble, so bail out.
* NB: This is however not a problem if we are writing the first part.
- * It simply means that we are overriding an existing volume...
+ * It simply means that we are over writing an existing volume...
*/
- if (dev->num_parts > 0) {
+ if (dev->num_dvd_parts > 0) {
make_mounted_dvd_filename(dev, archive_name); /* makes dvd name */
+ Dmsg1(100, "Check if part on DVD: %s\n", archive_name.c_str());
if (stat(archive_name.c_str(), &buf) == 0) {
/* bad news bail out */
+ dev->set_part_spooled(false);
Mmsg1(&dev->errmsg, _("Next Volume part already exists on DVD. Cannot continue: %s\n"),
archive_name.c_str());
return -1;
}
}
- Dmsg2(100, "num_parts=%d part=%d\n", dev->num_parts, dev->part);
- dev->VolCatInfo.VolCatParts = dev->part;
+#ifdef neeeded
+ Dmsg2(400, "num_dvd_parts=%d part=%d\n", dev->num_dvd_parts, dev->part);
make_spooled_dvd_filename(dev, archive_name); /* makes spool name */
/* Check if the next part exists in spool directory . */
+ Dmsg1(100, "Check if part on spool: %s\n", archive_name.c_str());
if ((stat(archive_name.c_str(), &buf) == 0) || (errno != ENOENT)) {
- Dmsg1(29, "open_next_part %s is in the way, moving it away...\n", archive_name.c_str());
+ Dmsg1(29, "======= Part %s is in the way, deleting it...\n", archive_name.c_str());
/* Then try to unlink it */
if (unlink(archive_name.c_str()) < 0) {
berrno be;
+ dev->set_part_spooled(false);
dev->dev_errno = errno;
Mmsg2(dev->errmsg, _("open_next_part can't unlink existing part %s, ERR=%s\n"),
archive_name.c_str(), be.strerror());
return -1;
}
}
+#endif
}
- /* KES. It seems to me that this if should not be
- * needed. If num_parts represents what is on the DVD
- * we should only need to change it when writing a part
- * to the DVD.
- * NB. As dvd_write_part increments dev->num_parts, I also
- * think it is not needed.
- */
- if (dev->num_parts < dev->part) {
- Dmsg2(100, "Set npart=%d to part=%d\n", dev->num_parts, dev->part);
- dev->num_parts = dev->part;
- dev->VolCatInfo.VolCatParts = dev->part;
- }
- Dmsg2(50, "Call dev->open(vol=%s, mode=%d\n", dev->VolCatInfo.VolCatName,
+
+ Dmsg2(400, "Call dev->open(vol=%s, mode=%d)\n", dcr->VolCatInfo.VolCatName,
dev->openmode);
- /* Open next part */
-
- int append = dev->can_append();
- if (dev->open(dcr, dev->openmode) < 0) {
+
+ /* Open next part. Note, this sets part_size for part opened. */
+ if (dev->open(dcr, OPEN_READ_ONLY) < 0) {
return -1;
}
- dev->set_labeled(); /* all next parts are "labeled" */
- if (append && (dev->part == dev->num_parts)) { /* If needed, set the append flag back */
- dev->set_append();
- }
+ dev->set_labeled(); /* all next parts are "labeled" */
return dev->fd;
}
-/* Open the first part file.
+/*
+ * Open the first part file.
* - Close the fd
* - Reopen the device
*/
-int dvd_open_first_part(DCR *dcr, int mode)
+static bool dvd_open_first_part(DCR *dcr, int mode)
{
DEVICE *dev = dcr->dev;
- Dmsg5(29, "Enter: ==== open_first_part dev=%s Vol=%s mode=%d num_parts=%d append=%d\n", dev->print_name(),
- dev->VolCatInfo.VolCatName, dev->openmode, dev->num_parts, dev->can_append());
+ Dmsg5(29, "Enter: ==== open_first_part dev=%s Vol=%s mode=%d num_dvd_parts=%d append=%d\n", dev->print_name(),
+ dev->VolCatInfo.VolCatName, dev->openmode, dev->num_dvd_parts, dev->can_append());
- if (dev->fd >= 0) {
- close(dev->fd);
- }
- dev->fd = -1;
- dev->clear_opened();
-
- dev->part_start = 0;
- dev->part = 0;
-
- Dmsg2(50, "Call dev->open(vol=%s, mode=%d)\n", dcr->VolCatInfo.VolCatName,
+
+ dev->close_part(dcr);
+
+ Dmsg2(400, "Call dev->open(vol=%s, mode=%d)\n", dcr->VolCatInfo.VolCatName,
mode);
- int append = dev->can_append();
+ Dmsg0(100, "Set part=1\n");
+ dev->part = 1;
+ dev->part_start = 0;
+
if (dev->open(dcr, mode) < 0) {
- Dmsg0(50, "open dev() failed\n");
- return -1;
- }
- if (append && (dev->part == dev->num_parts)) { /* If needed, set the append flag back */
- dev->set_append();
+ Dmsg0(400, "open dev() failed\n");
+ return false;
}
- Dmsg2(50, "Leave open_first_part state=%s append=%d\n", dev->is_open()?"open":"not open", dev->can_append());
+ Dmsg2(400, "Leave open_first_part state=%s append=%d\n", dev->is_open()?"open":"not open", dev->can_append());
- return dev->fd;
+ return true;
}
-/* Protected version of lseek, which opens the right part if necessary */
-off_t lseek_dev(DEVICE *dev, off_t offset, int whence)
+/*
+ * Do an lseek on a DVD handling all the different parts
+ */
+off_t lseek_dvd(DCR *dcr, off_t offset, int whence)
{
- DCR *dcr;
+ DEVICE *dev = dcr->dev;
off_t pos;
char ed1[50], ed2[50];
- Dmsg3(100, "Enter lseek_dev fd=%d part=%d nparts=%d\n", dev->fd,
- dev->part, dev->num_parts);
- if (!dev->is_dvd()) {
- Dmsg0(100, "Using sys lseek\n");
- return lseek(dev->fd, offset, whence);
- }
-
- dcr = (DCR *)dev->attached_dcrs->first(); /* any dcr will do */
+ Dmsg5(400, "Enter lseek_dvd fd=%d off=%s w=%d part=%d nparts=%d\n", dev->fd,
+ edit_int64(offset, ed1), whence, dev->part, dev->num_dvd_parts);
+
switch(whence) {
case SEEK_SET:
- Dmsg2(100, "lseek_dev SEEK_SET to %s (part_start=%s)\n",
- edit_uint64(offset, ed1), edit_uint64(dev->part_start, ed2));
+ Dmsg2(400, "lseek_dvd SEEK_SET to %s (part_start=%s)\n",
+ edit_int64(offset, ed1), edit_uint64(dev->part_start, ed2));
if ((uint64_t)offset >= dev->part_start) {
- if (((uint64_t)offset == dev->part_start) || ((uint64_t)offset < (dev->part_start+dev->part_size))) {
+ if ((uint64_t)offset == dev->part_start ||
+ (uint64_t)offset < dev->part_start+dev->part_size) {
/* We are staying in the current part, just seek */
if ((pos = lseek(dev->fd, offset-dev->part_start, SEEK_SET)) < 0) {
return pos;
}
} else {
/* Load next part, and start again */
+ Dmsg0(100, "lseek open next part\n");
if (dvd_open_next_part(dcr) < 0) {
- Dmsg0(100, "lseek_dev failed while trying to open the next part\n");
+ Dmsg0(400, "lseek_dvd failed while trying to open the next part\n");
return -1;
}
- return lseek_dev(dev, offset, SEEK_SET);
+ Dmsg2(100, "Recurse lseek after open next part=%d num_part=%d\n",
+ dev->part, dev->num_dvd_parts);
+ return lseek_dvd(dcr, offset, SEEK_SET);
}
} else {
/*
* so just load the first one, and seek again
* until the right one is loaded
*/
- if (dvd_open_first_part(dcr, dev->openmode) < 0) {
- Dmsg0(100, "lseek_dev failed while trying to open the first part\n");
+ Dmsg0(100, "lseek open first part\n");
+ if (!dvd_open_first_part(dcr, dev->openmode)) {
+ Dmsg0(400, "lseek_dvd failed while trying to open the first part\n");
return -1;
}
- return lseek_dev(dev, offset, SEEK_SET);
+ Dmsg2(100, "Recurse lseek after open first part=%d num_part=%d\n",
+ dev->part, dev->num_dvd_parts);
+ return lseek_dvd(dcr, offset, SEEK_SET); /* system lseek */
}
break;
case SEEK_CUR:
- Dmsg1(100, "lseek_dev SEEK_CUR to %s\n", edit_uint64(offset, ed1));
+ Dmsg1(400, "lseek_dvd SEEK_CUR to %s\n", edit_int64(offset, ed1));
if ((pos = lseek(dev->fd, (off_t)0, SEEK_CUR)) < 0) {
- return pos;
+ Dmsg0(400, "Seek error.\n");
+ return pos;
}
pos += dev->part_start;
if (offset == 0) {
- Dmsg1(100, "lseek_dev SEEK_CUR returns %s\n", edit_uint64(pos, ed1));
+ Dmsg1(400, "lseek_dvd SEEK_CUR returns %s\n", edit_uint64(pos, ed1));
return pos;
- } else { /* Not used in Bacula, but should work */
- return lseek_dev(dev, pos, SEEK_SET);
+ } else {
+ Dmsg1(400, "do lseek_dvd SEEK_SET %s\n", edit_uint64(pos, ed1));
+ return lseek_dvd(dcr, pos, SEEK_SET);
}
break;
case SEEK_END:
- Dmsg1(100, "lseek_dev SEEK_END to %s\n", edit_uint64(offset, ed1));
+ Dmsg1(400, "lseek_dvd SEEK_END to %s\n", edit_int64(offset, ed1));
/*
* Bacula does not use offsets for SEEK_END
* Also, Bacula uses seek_end only when it wants to
* itself is read-only (as currently implemented).
*/
if (offset > 0) { /* Not used by bacula */
- Dmsg1(100, "lseek_dev SEEK_END called with an invalid offset %s\n",
+ Dmsg1(400, "lseek_dvd SEEK_END called with an invalid offset %s\n",
edit_uint64(offset, ed1));
errno = EINVAL;
return -1;
/* If we are already on a spooled part and have the
* right part number, simply seek
*/
- if (dev->is_part_spooled() && dev->part == dev->num_parts) {
+ if (dev->is_part_spooled() && dev->part > dev->num_dvd_parts) {
if ((pos = lseek(dev->fd, (off_t)0, SEEK_END)) < 0) {
return pos;
} else {
- Dmsg1(100, "lseek_dev SEEK_END returns %s\n",
+ Dmsg1(400, "lseek_dvd SEEK_END returns %s\n",
edit_uint64(pos + dev->part_start, ed1));
return pos + dev->part_start;
}
* (useful for DVDs)
*/
int modesave = dev->openmode;
- /* Works because num_parts > 0. */
- if (dvd_open_first_part(dcr, OPEN_READ_ONLY) < 0) {
- Dmsg0(100, "lseek_dev failed while trying to open the first part\n");
+ if (!dvd_open_first_part(dcr, OPEN_READ_ONLY)) {
+ Dmsg0(400, "lseek_dvd failed while trying to open the first part\n");
return -1;
}
- if (dev->num_parts > 0) {
- while (dev->part < (dev->num_parts-1)) {
+ if (dev->num_dvd_parts > 0) {
+ while (dev->part < dev->num_dvd_parts) {
if (dvd_open_next_part(dcr) < 0) {
- Dmsg0(100, "lseek_dev failed while trying to open the next part\n");
+ Dmsg0(400, "lseek_dvd failed while trying to open the next part\n");
return -1;
}
}
dev->openmode = modesave;
if (dvd_open_next_part(dcr) < 0) {
- Dmsg0(100, "lseek_dev failed while trying to open the next part\n");
+ Dmsg0(400, "lseek_dvd failed while trying to open the next part\n");
return -1;
}
}
- return lseek_dev(dev, 0, SEEK_END);
+ return lseek_dvd(dcr, 0, SEEK_END);
}
break;
default:
+ Dmsg0(400, "Seek call error.\n");
errno = EINVAL;
return -1;
}
JCR *jcr = dcr->jcr;
bool ok = true;
- /* If the device is a dvd and WritePartAfterJob
+ /*
+ * If the device is a dvd and WritePartAfterJob
* is set to yes, open the next part, so, in case of a device
* that requires mount, it will be written to the device.
*/
if (dev->is_dvd() && jcr->write_part_after_job && (dev->part_size > 0)) {
- Dmsg1(100, "Writing last part=%d write_partafter_job is set.\n",
+ Dmsg1(400, "Writing last part=%d write_partafter_job is set.\n",
dev->part);
- if (dev->part < dev->num_parts) {
- Jmsg3(jcr, M_FATAL, 0, _("Error while writing, current part number is less than the total number of parts (%d/%d, device=%s)\n"),
- dev->part, dev->num_parts, dev->print_name());
+ if (dev->part < dev->num_dvd_parts+1) {
+ Jmsg3(jcr, M_FATAL, 0, _("Error writing. Current part less than total number of parts (%d/%d, device=%s)\n"),
+ dev->part, dev->num_dvd_parts, dev->print_name());
dev->dev_errno = EIO;
ok = false;
}
- /* This should be !dvd_write_part(dcr)
- NB: No! If you call dvd_write_part, the part number is not updated.
- You must open the next part, it will automatically write the part and
- update the part number. */
- if (ok && (dvd_open_next_part(dcr) < 0)) {
- Jmsg2(jcr, M_FATAL, 0, _("Unable to write part %s: ERR=%s\n"),
- dev->print_name(), strerror_dev(dev));
+ if (ok && !dvd_write_part(dcr)) {
+ Jmsg2(jcr, M_FATAL, 0, _("Unable to write last on %s: ERR=%s\n"),
+ dev->print_name(), dev->bstrerror());
dev->dev_errno = EIO;
ok = false;
}
}
- Dmsg1(200, "Set VolCatParts=%d\n", dev->num_parts);
- dev->VolCatInfo.VolCatParts = dev->num_parts;
return ok;
}
-bool truncate_dvd(DCR *dcr) {
+void dvd_remove_empty_part(DCR *dcr)
+{
+ DEVICE *dev = dcr->dev;
+
+ /* Remove the last part file if it is empty */
+ if (dev->is_dvd() && dev->num_dvd_parts > 0) {
+ struct stat statp;
+ uint32_t part_save = dev->part;
+ POOL_MEM archive_name(PM_FNAME);
+ int status;
+
+ dev->part = dev->num_dvd_parts;
+ make_spooled_dvd_filename(dev, archive_name);
+ /* Check that the part file is empty */
+ status = stat(archive_name.c_str(), &statp);
+ if (status == 0 && statp.st_size == 0) {
+ Dmsg3(100, "Unlink empty part in close call make_dvd_filename. part=%d num=%d vol=%s\n",
+ part_save, dev->num_dvd_parts, dev->VolCatInfo.VolCatName);
+ Dmsg1(100, "unlink(%s)\n", archive_name.c_str());
+ unlink(archive_name.c_str());
+ if (part_save == dev->part) {
+ dev->set_part_spooled(false); /* no spooled part left */
+ }
+ } else if (status < 0) {
+ if (part_save == dev->part) {
+ dev->set_part_spooled(false); /* spool doesn't exit */
+ }
+ }
+ dev->part = part_save; /* restore part number */
+ }
+}
+
+bool truncate_dvd(DCR *dcr)
+{
DEVICE* dev = dcr->dev;
- /* Set num_parts to zero (on disk) */
- dev->num_parts = 0;
+ dev->clear_freespace_ok(); /* need to update freespace */
+ dev->close_part(dcr);
+
+ if (!unmount_dvd(dev, 1)) {
+ Dmsg0(400, "truncate_dvd: Failed to unmount DVD\n");
+ return false;
+ }
+
+ /* If necessary, delete its spool file. */
+ if (dev->is_part_spooled()) {
+ POOL_MEM archive_name(PM_FNAME);
+ /* Delete spool file */
+ make_spooled_dvd_filename(dev, archive_name);
+ unlink(archive_name.c_str());
+ dev->set_part_spooled(false);
+ }
+
+ /* Set num_dvd_parts to zero (on disk) */
+ dev->part = 0;
+ dev->num_dvd_parts = 0;
dcr->VolCatInfo.VolCatParts = 0;
dev->VolCatInfo.VolCatParts = 0;
- Dmsg0(100, "truncate_dvd: Opening first part (1)...\n");
+ Dmsg0(400, "truncate_dvd: Opening first part (1)...\n");
dev->truncating = true;
- if (dvd_open_first_part(dcr, OPEN_READ_WRITE) < 0) {
- Dmsg0(100, "truncate_dvd: Error while opening first part (1).\n");
+ /* This creates a zero length spool file and sets part=1 */
+ if (!dvd_open_first_part(dcr, CREATE_READ_WRITE)) {
+ Dmsg0(400, "truncate_dvd: Error while opening first part (1).\n");
dev->truncating = false;
return false;
}
- dev->truncating = false;
- Dmsg0(100, "truncate_dvd: Truncating...\n");
-
- /* If necessary, truncate it. */
- if (ftruncate(dev->fd, 0) != 0) {
- berrno be;
- Mmsg2(dev->errmsg, _("Unable to truncate device %s. ERR=%s\n"),
- dev->print_name(), be.strerror());
- return false;
- }
-
- close(dev->fd);
- dev->fd = -1;
- dev->clear_opened();
+ dev->close_part(dcr);
- Dmsg0(100, "truncate_dvd: Opening first part (2)...\n");
+ Dmsg0(400, "truncate_dvd: Opening first part (2)...\n");
+ /*
+ * Now actually truncate the DVD which is done by writing
+ * a zero length part to the DVD/
+ */
if (!dvd_write_part(dcr)) {
- Dmsg0(100, "truncate_dvd: Error while writing to DVD.\n");
+ Dmsg0(400, "truncate_dvd: Error while writing to DVD.\n");
+ dev->truncating = false;
return false;
}
+ dev->truncating = false;
- /* Set num_parts to zero (on disk) */
- dev->num_parts = 0;
+ /* Set num_dvd_parts to zero (on disk) */
+ dev->part = 0;
+ dev->num_dvd_parts = 0;
dcr->VolCatInfo.VolCatParts = 0;
dev->VolCatInfo.VolCatParts = 0;
-
- if (dvd_open_first_part(dcr, OPEN_READ_WRITE) < 0) {
- Dmsg0(100, "truncate_dvd: Error while opening first part (2).\n");
+ /* Clear the size of the volume */
+ dev->VolCatInfo.VolCatBytes = 0;
+ dcr->VolCatInfo.VolCatBytes = 0;
+
+ /* Update catalog */
+ if (!dir_update_volume_info(dcr, false)) {
return false;
}
-
+
return true;
}
-/* Checks if we can write on a non-blank DVD: meaning that it just have been
- * truncated (there is only one zero-sized file on the DVD, with the right
- * volume name). */
-bool check_can_write_on_non_blank_dvd(DCR *dcr) {
+/*
+ * Checks if we can write on a non-blank DVD: meaning that it just have been
+ * truncated (there is only one zero-sized file on the DVD).
+ *
+ * Note! Normally if we can mount the device, which should be the case
+ * when we get here, it is not a blank DVD. Hence we check if
+ * if all files are of zero length (i.e. no data), in which case we allow it.
+ *
+ */
+bool check_can_write_on_non_blank_dvd(DCR *dcr)
+{
DEVICE* dev = dcr->dev;
DIR* dp;
struct dirent *entry, *result;
int name_max;
- int count = 0;
- int matched = 0; /* We found an empty file with the right name. */
struct stat filestat;
+ bool ok = true;
name_max = pathconf(".", _PC_NAME_MAX);
if (name_max < 1024) {
}
entry = (struct dirent *)malloc(sizeof(struct dirent) + name_max + 1000);
- while (1) {
+ for ( ;; ) {
if ((readdir_r(dp, entry, &result) != 0) || (result == NULL)) {
dev->dev_errno = EIO;
- Dmsg2(129, "check_can_write_on_non_blank_dvd: failed to find suitable file in dir %s (dev=%s)\n",
+ Dmsg2(129, "check_can_write_on_non_blank_dvd: no more files in dir %s (dev=%s)\n",
dev->device->mount_point, dev->print_name());
break;
} else {
Dmsg2(99, "check_can_write_on_non_blank_dvd: found %s (versus %s)\n",
result->d_name, dev->VolCatInfo.VolCatName);
- if (strcmp(result->d_name, dev->VolCatInfo.VolCatName) == 0) {
- /* Found the file, checking it is empty */
+ if (strcmp(result->d_name, ".") && strcmp(result->d_name, "..") &&
+ strcmp(result->d_name, ".keep")) {
+ /* Found a file, checking it is empty */
POOL_MEM filename(PM_FNAME);
pm_strcpy(filename, dev->device->mount_point);
if (filename.c_str()[strlen(filename.c_str())-1] != '/') {
pm_strcat(filename, "/");
}
- pm_strcat(filename, dev->VolCatInfo.VolCatName);
+ pm_strcat(filename, result->d_name);
if (stat(filename.c_str(), &filestat) < 0) {
berrno be;
dev->dev_errno = errno;
Dmsg2(29, "check_can_write_on_non_blank_dvd: cannot stat file (file=%s), ERR=%s\n",
filename.c_str(), be.strerror());
- return false;
+ ok = false;
+ break;
}
- Dmsg2(99, "check_can_write_on_non_blank_dvd: size of %s is %d\n",
+ Dmsg2(99, "check_can_write_on_non_blank_dvd: size of %s is %lld\n",
filename.c_str(), filestat.st_size);
- matched = filestat.st_size == 0;
+ if (filestat.st_size != 0) {
+ ok = false;
+ break;
+ }
}
}
- count++;
}
free(entry);
closedir(dp);
- Dmsg2(29, "check_can_write_on_non_blank_dvd: got %d files in the mount point (matched=%d)\n", count, matched);
+ Dmsg1(29, "OK can_write_on_non_blank_dvd: OK=%d\n", ok);
+ return ok;
+}
+
+/*
+ * Mount a DVD device, then scan to find out how many parts
+ * there are.
+ */
+int find_num_dvd_parts(DCR *dcr)
+{
+ DEVICE *dev = dcr->dev;
+ int num_parts = 0;
+
+ if (!dev->is_dvd()) {
+ return 0;
+ }
- if (count != 3) {
- /* There are more than 3 files (., .., and the volume file) */
- return false;
+ if (dev->mount(1)) {
+ DIR* dp;
+ struct dirent *entry, *result;
+ int name_max;
+ int len = strlen(dcr->VolCatInfo.VolCatName);
+
+ /* Now count the number of parts */
+ name_max = pathconf(".", _PC_NAME_MAX);
+ if (name_max < 1024) {
+ name_max = 1024;
+ }
+
+ if (!(dp = opendir(dev->device->mount_point))) {
+ berrno be;
+ dev->dev_errno = errno;
+ Dmsg3(29, "find_num_dvd_parts: failed to open dir %s (dev=%s), ERR=%s\n",
+ dev->device->mount_point, dev->print_name(), be.strerror());
+ goto get_out;
+ }
+
+ entry = (struct dirent *)malloc(sizeof(struct dirent) + name_max + 1000);
+
+ Dmsg1(100, "Looking for Vol=%s\n", dcr->VolCatInfo.VolCatName);
+ for ( ;; ) {
+ int flen;
+ bool ignore;
+ if ((readdir_r(dp, entry, &result) != 0) || (result == NULL)) {
+ dev->dev_errno = EIO;
+ Dmsg2(129, "find_num_dvd_parts: failed to find suitable file in dir %s (dev=%s)\n",
+ dev->device->mount_point, dev->print_name());
+ break;
+ }
+ flen = strlen(result->d_name);
+ ignore = true;
+ if (flen >= len) {
+ result->d_name[len] = 0;
+ if (strcmp(dcr->VolCatInfo.VolCatName, result->d_name) == 0) {
+ num_parts++;
+ Dmsg1(100, "find_num_dvd_parts: found part: %s\n", result->d_name);
+ ignore = false;
+ }
+ }
+ if (ignore) {
+ Dmsg2(129, "find_num_dvd_parts: ignoring %s in %s\n",
+ result->d_name, dev->device->mount_point);
+ }
+ }
+ free(entry);
+ closedir(dp);
+ Dmsg1(29, "find_num_dvd_parts = %d\n", num_parts);
}
- return matched;
+get_out:
+ dev->set_freespace_ok();
+ if (dev->is_mounted()) {
+ dev->unmount(0);
+ }
+ return num_parts;
}
projects / bacula / bacula / blobdiff