#include "stored.h"
/* Forward referenced functions */
-static char *edit_device_codes_dev(DEVICE *dev, char *omsg, const char *imsg);
+static void edit_device_codes_dev(DEVICE *dev, POOL_MEM &omsg, const char *imsg);
static bool do_mount_dev(DEVICE* dev, int mount, int dotimeout);
static void add_file_and_part_name(DEVICE *dev, POOL_MEM &archive_name);
{
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 *icmd;
int status, timeout;
+ sm_check(__FILE__, __LINE__, false);
if (mount) {
if (dev->is_mounted()) {
+ Dmsg0(200, "======= DVD mount=1\n");
return true;
}
icmd = dev->device->mount_command;
} else {
if (!dev->is_mounted()) {
+ Dmsg0(200, "======= DVD mount=0\n");
return true;
}
icmd = dev->device->unmount_command;
}
- edit_device_codes_dev(dev, ocmd.c_str(), icmd);
+ edit_device_codes_dev(dev, ocmd, icmd);
Dmsg2(200, "do_mount_dev: cmd=%s mounted=%d\n", ocmd.c_str(), !!dev->is_mounted());
} else {
timeout = 0;
}
- results = get_pool_memory(PM_MESSAGE);
+ results = get_memory(2000);
results[0] = 0;
/* If busy retry each second */
while ((status = run_program_full_output(ocmd.c_str(),
dev->max_open_wait/2, results)) != 0) {
- Dmsg1(100, "results len=%d\n", strlen(results));
if (fnmatch("*is already mounted on", results, 0) == 0) {
break;
}
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);
-#ifdef xxx
/*
* Now, just to be sure it is not mounted, try to read the
* filesystem.
if (!(dp = opendir(dev->device->mount_point))) {
berrno be;
dev->dev_errno = errno;
- Dmsg3(29, "open_mounted_dev: failed to open dir %s (dev=%s), ERR=%s\n", dev->device->mount_point, dev->dev_name, be.strerror());
+ Dmsg3(29, "open_mounted_dev: failed to open dir %s (dev=%s), ERR=%s\n",
+ dev->device->mount_point, dev->print_name(), be.strerror());
goto get_out;
}
while (1) {
if ((readdir_r(dp, entry, &result) != 0) || (result == NULL)) {
dev->dev_errno = ENOENT;
- Dmsg2(29, "open_mounted_dev: failed to find suitable file in dir %s (dev=%s)\n", dev->device->mount_point, dev->dev_name);
+ Dmsg2(29, "open_mounted_dev: failed to find suitable file in dir %s (dev=%s)\n",
+ dev->device->mount_point, dev->print_name());
break;
}
count++;
break; /* there must be something mounted */
}
get_out:
-#endif
+ dev->set_mounted(false);
+ sm_check(__FILE__, __LINE__, false);
free_pool_memory(results);
+ Dmsg0(200, "============ DVD mount=0\n");
return false;
}
dev->set_mounted(mount); /* set/clear mounted flag */
free_pool_memory(results);
+ update_free_space_dev(dev);
+ Dmsg1(200, "============ DVD mount=%d\n", mount);
return true;
}
long long int free;
char ed1[50];
+ sm_check(__FILE__, __LINE__, false);
icmd = dev->device->free_space_command;
if (!icmd) {
return;
}
- edit_device_codes_dev(dev, ocmd.c_str(), icmd);
+ edit_device_codes_dev(dev, ocmd, icmd);
Dmsg1(29, "update_free_space_dev: cmd=%s\n", ocmd.c_str());
results = get_pool_memory(PM_MESSAGE);
- results[0] = 0;
/* Try at most 3 times to get the free space on the device. This should perhaps be configurable. */
timeout = 3;
while (1) {
if (run_program_full_output(ocmd.c_str(), dev->max_open_wait/2, results) == 0) {
- Dmsg1(100, "results len=%d\n", strlen(results));
Dmsg1(100, "Free space program run : %s\n", results);
free = str_to_int64(results);
if (free >= 0) {
if (--timeout > 0) {
Dmsg4(40, "Cannot get free space on device %s. free_space=%s, "
- "free_space_errno=%d ERR=%s\n", dev->dev_name,
+ "free_space_errno=%d ERR=%s\n", dev->print_name(),
edit_uint64(dev->free_space, ed1), dev->free_space_errno,
dev->errmsg);
bmicrosleep(1, 0);
dev->dev_errno = -dev->free_space_errno;
Dmsg4(40, "Cannot get free space on device %s. free_space=%s, "
"free_space_errno=%d ERR=%s\n",
- dev->dev_name, edit_uint64(dev->free_space, ed1),
+ dev->print_name(), edit_uint64(dev->free_space, ed1),
dev->free_space_errno, dev->errmsg);
break;
}
free_pool_memory(results);
Dmsg3(29, "update_free_space_dev: free_space=%s, free_space_errno=%d have_media=%d\n",
edit_uint64(dev->free_space, ed1), dev->free_space_errno, dev->have_media());
+ sm_check(__FILE__, __LINE__, false);
return;
}
static bool dvd_write_part(DCR *dcr)
{
DEVICE *dev = dcr->dev;
- Dmsg1(29, "dvd_write_part: device is %s\n", dev->print_name());
-
- if (!unmount_dev(dev, 1)) {
- Dmsg0(29, "dvd_write_part: unable to unmount the device\n");
- }
-
POOL_MEM ocmd(PM_FNAME);
- POOL_MEM results(PM_MESSAGE);
char* icmd;
int status;
int timeout;
- int part;
char ed1[50];
- results.c_str()[0] = 0;
+ sm_check(__FILE__, __LINE__, false);
+ Dmsg1(29, "dvd_write_part: device is %s\n", dev->print_name());
icmd = dev->device->write_part_command;
- /*
- * Note! part is used to control whether or not we create a
- * new filesystem. If the device could be mounted, it is because
- * it already has a filesystem, so we artificially set part=1
- * to avoid zapping an existing filesystem.
- */
- part = dev->part;
- if (dev->is_mounted() && dev->part < 2) {
- dev->part = 2; /* do not wipe out existing filesystem */
- }
- edit_device_codes_dev(dev, ocmd.c_str(), icmd);
- dev->part = part;
+ edit_device_codes_dev(dev, ocmd, icmd);
/*
* Wait at most the time a maximum size part is written in DVD 0.5x speed
Dmsg2(29, "dvd_write_part: cmd=%s timeout=%d\n", ocmd.c_str(), timeout);
+{
+ POOL_MEM results(PM_MESSAGE);
+ sm_check(__FILE__, __LINE__, false);
status = run_program_full_output(ocmd.c_str(), timeout, results.c_str());
- Dmsg1(100, "results len=%d\n", strlen(results.c_str()));
+ sm_check(__FILE__, __LINE__, false);
if (status != 0) {
Mmsg1(dev->errmsg, "Error while writing current part to the DVD: %s",
results.c_str());
dev->dev_errno = EIO;
return false;
}
+ sm_check(__FILE__, __LINE__, false);
+}
+{
POOL_MEM archive_name(PM_FNAME);
/* Delete spool file */
make_spooled_dvd_filename(dev, archive_name);
unlink(archive_name.c_str());
Dmsg1(29, "unlink(%s)\n", archive_name.c_str());
+ sm_check(__FILE__, __LINE__, false);
+}
update_free_space_dev(dev);
Jmsg(dcr->jcr, M_INFO, 0, _("Remaining free space %s on %s\n"),
edit_uint64_with_commas(dev->free_space, ed1), dev->print_name());
- Dmsg1(100, "results=%s\n", results.c_str());
+ sm_check(__FILE__, __LINE__, false);
return true;
}
return -1;
}
+ Dmsg2(100, "Set npart=%d to part=%d\n", dev->num_parts, dev->part);
dev->num_parts = dev->part;
dev->VolCatInfo.VolCatParts = dev->part;
make_spooled_dvd_filename(dev, archive_name); /* makes spool name */
}
}
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", dev->VolCatInfo.VolCatName,
+ Dmsg2(50, "Call dev->open(vol=%s, mode=%d\n", dev->VolCatInfo.VolCatName,
dev->openmode);
/* Open next part */
if (dev->open(dcr, dev->openmode) < 0) {
{
DEVICE *dev = dcr->dev;
- Dmsg3(29, "Enter: ==== open_first_part dev=%s Vol=%s mode=%d\n", dev->dev_name,
+ Dmsg3(29, "Enter: ==== open_first_part dev=%s Vol=%s mode=%d\n", dev->print_name(),
dev->VolCatInfo.VolCatName, dev->openmode);
if (dev->fd >= 0) {
/* Protected version of lseek, which opens the right part if necessary */
off_t lseek_dev(DEVICE *dev, off_t offset, int whence)
{
- int openmode;
DCR *dcr;
off_t pos;
- Dmsg0(100, "Enter lseek_dev\n");
- if (!dev->is_dvd() || dev->num_parts <= 1) { /* If there is only one part, simply call lseek. */
+ 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);
}
case SEEK_SET:
Dmsg1(100, "lseek_dev SEEK_SET to %d\n", (int)offset);
if ((uint64_t)offset >= dev->part_start) {
- if ((uint64_t)(offset - dev->part_start) < dev->part_size) {
+ offset -= dev->part_start; /* adjust for start of this part */
+ if (offset == 0 || (uint64_t)offset < dev->part_size) {
/* We are staying in the current part, just seek */
- offset -= dev->part_start; /* adjust for start of this part */
if ((pos = lseek(dev->fd, offset, SEEK_SET)) < 0) {
return pos;
} else {
break;
case SEEK_END:
Dmsg1(100, "lseek_dev SEEK_END to %d\n", (int)offset);
+ /*
+ * Bacula does not use offsets for SEEK_END
+ * Also, Bacula uses seek_end only when it wants to
+ * append to the volume, so for a dvd that means
+ * that the volume must be spooled since the DVD
+ * 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 %d\n", (int)offset);
errno = EINVAL;
return -1;
}
-
- if (dev->part == dev->num_parts) { /* The right part is already loaded */
+ /* 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 ((pos = lseek(dev->fd, (off_t)0, SEEK_END)) < 0) {
return pos;
} else {
return pos + dev->part_start;
}
} else {
- /* Load the first part, then load the next until we reach the last one.
- * This is the only way to be sure we compute the right file address. */
- /* Save previous openmode, and open all but last part read-only (useful for DVDs) */
- openmode = dev->openmode;
-
+ /*
+ * Load the first part, then load the next until we reach the last one.
+ * This is the only way to be sure we compute the right file address.
+ *
+ * Save previous openmode, and open all but last part read-only
+ * (useful for DVDs)
+ */
+ int modesave = dev->openmode;
/* Works because num_parts > 0. */
if (open_first_part(dcr, OPEN_READ_ONLY) < 0) {
Dmsg0(100, "lseek_dev failed while trying to open the first part\n");
return -1;
}
}
- dev->openmode = openmode;
+ dev->openmode = modesave;
if (open_next_part(dcr) < 0) {
Dmsg0(100, "lseek_dev failed while trying to open the next part\n");
return -1;
* Edit codes into (Un)MountCommand, Write(First)PartCommand
* %% = %
* %a = archive device name
+ * %e = erase (set if cannot mount and first part)
* %m = mount point
* %v = last part name
*
* imsg = input string containing edit codes (%x)
*
*/
-static char *edit_device_codes_dev(DEVICE* dev, char *omsg, const char *imsg)
+static void edit_device_codes_dev(DEVICE* dev, POOL_MEM &omsg, const char *imsg)
{
const char *p;
const char *str;
POOL_MEM archive_name(PM_FNAME);
- *omsg = 0;
+ omsg.c_str()[0] = 0;
Dmsg1(800, "edit_device_codes: %s\n", imsg);
for (p=imsg; *p; p++) {
if (*p == '%') {
case '%':
str = "%";
break;
+ case 'a':
+ str = dev->dev_name;
+ break;
+ case 'e':
+ if (dev->part == 1 && !dev->is_mounted()) {
+ str = "1";
+ } else {
+ str = "0";
+ }
+ break;
case 'n':
bsnprintf(add, sizeof(add), "%d", dev->part);
str = add;
break;
- case 'a':
- str = dev->dev_name;
- break;
case 'm':
str = dev->device->mount_point;
break;
str = add;
}
Dmsg1(1900, "add_str %s\n", str);
- pm_strcat(&omsg, (char *)str);
- Dmsg1(1800, "omsg=%s\n", omsg);
+ pm_strcat(omsg, (char *)str);
+ Dmsg1(1800, "omsg=%s\n", omsg.c_str());
}
- return omsg;
}
projects / bacula / bacula / blobdiff