*
*/
/*
- Copyright (C) 2001-2006 Kern Sibbald
+ Copyright (C) 2001-2005 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
static bool cancel_cmd(JCR *cjcr);
static bool mount_cmd(JCR *jcr);
static bool unmount_cmd(JCR *jcr);
-static bool bootstrap_cmd(JCR *jcr);
static bool changer_cmd(JCR *sjcr);
static bool do_label(JCR *jcr, int relabel);
static DCR *find_device(JCR *jcr, POOL_MEM &dev_name, int drive);
if ((bnet_stat = bnet_recv(bs)) <= 0) {
break; /* connection terminated */
}
- Dmsg1(199, "<dird: %s\n", bs->msg);
+ Dmsg1(199, "<dird: %s", bs->msg);
/* Ensure that device initialization is complete */
while (!init_done) {
bmicrosleep(1, 0);
if (!(jcr=get_jcr_by_full_name(Job))) {
bnet_fsend(dir, _("3904 Job %s not found.\n"), Job);
} else {
- P(jcr->mutex);
+ jcr->lock();
oldStatus = jcr->JobStatus;
set_jcr_job_status(jcr, JS_Canceled);
if (!jcr->authenticated && oldStatus == JS_WaitFD) {
pthread_cond_signal(&jcr->job_start_wait); /* wake waiting thread */
}
- V(jcr->mutex);
+ jcr->unlock();
if (jcr->file_bsock) {
bnet_sig(jcr->file_bsock, BNET_TERMINATE);
}
dev = dcr->dev;
P(dev->mutex); /* Use P to avoid indefinite block */
if (!dev->is_open()) {
- Dmsg1(400, "Can %slabel. Device is not open\n", relabel?"re":"");
+ Dmsg0(400, "Can relabel. Device is not open\n");
label_volume_if_ok(dcr, oldname, newname, poolname, slot, relabel);
- dev->close();
+ force_close_device(dev);
/* Under certain "safe" conditions, we can steal the lock */
} else if (dev->can_steal_lock()) {
Dmsg0(400, "Can relabel. can_steal_lock\n");
bsteal_lock_t hold;
DEVICE *dev = dcr->dev;
int label_status;
- int mode;
steal_device_lock(dev, &hold, BST_WRITING_LABEL);
Dmsg1(100, "Stole device %s lock, writing label.\n", dev->print_name());
+ /* Note, try_autoload_device() opens the device */
if (!try_autoload_device(dcr->jcr, slot, newname)) {
goto bail_out; /* error */
}
- /* Ensure that the device is open -- autoload_device() closes it */
- if (dev->is_tape()) {
- mode = OPEN_READ_WRITE;
- } else {
- mode = CREATE_READ_WRITE;
- }
- if (dev->open(dcr, mode) < 0) {
- bnet_fsend(dir, _("3910 Unable to open device %s: ERR=%s\n"),
- dev->print_name(), dev->strerror());
- return;
- }
-
/* See what we have for a Volume */
label_status = read_dev_volume_label(dcr);
case VOL_IO_ERROR:
case VOL_NO_LABEL:
if (!write_new_volume_label_to_dev(dcr, newname, poolname)) {
- bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), dev->bstrerror());
+ bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), strerror_dev(dev));
break;
}
bstrncpy(dcr->VolumeName, newname, sizeof(dcr->VolumeName));
newname, dev->print_name());
break;
case VOL_NO_MEDIA:
- bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), dev->bstrerror());
+ bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), strerror_dev(dev));
break;
default:
bnet_fsend(dir, _("3913 Cannot label Volume. "
break;
}
}
- if (!found) {
- foreach_res(changer, R_AUTOCHANGER) {
- /* Find resource, and make sure we were able to open it */
- if (fnmatch(devname.c_str(), changer->hdr.name, 0) == 0) {
- /* Try each device in this AutoChanger */
- foreach_alist(device, changer->device) {
- Dmsg1(100, "Try changer device %s\n", device->hdr.name);
- if (!device->dev) {
- device->dev = init_dev(jcr, device);
- }
- if (!device->dev) {
- Dmsg1(100, "Device %s could not be opened. Skipped\n", devname.c_str());
- Jmsg(jcr, M_WARNING, 0, _("\n"
- " Device \"%s\" in changer \"%s\" requested by DIR could not be opened or does not exist.\n"),
- device->hdr.name, devname.c_str());
- continue;
- }
- if (!device->dev->autoselect) {
- Dmsg1(100, "Device %s not autoselect skipped.\n", devname.c_str());
- continue; /* device is not available */
- }
- if (drive < 0 || drive == (int)device->dev->drive_index) {
- Dmsg1(20, "Found changer device %s\n", device->hdr.name);
- found = true;
- break;
- }
- Dmsg3(100, "Device %s drive wrong: want=%d got=%d skipping\n",
- devname.c_str(), drive, (int)device->dev->drive_index);
+ foreach_res(changer, R_AUTOCHANGER) {
+ /* Find resource, and make sure we were able to open it */
+ if (fnmatch(devname.c_str(), changer->hdr.name, 0) == 0) {
+ /* Try each device in this AutoChanger */
+ foreach_alist(device, changer->device) {
+ Dmsg1(100, "Try changer device %s\n", device->hdr.name);
+ if (!device->dev) {
+ device->dev = init_dev(jcr, device);
+ }
+ if (!device->dev) {
+ Dmsg1(100, "Device %s could not be opened. Skipped\n", devname.c_str());
+ Jmsg(jcr, M_WARNING, 0, _("\n"
+ " Device \"%s\" in changer \"%s\" requested by DIR could not be opened or does not exist.\n"),
+ device->hdr.name, devname.c_str());
+ continue;
}
- break; /* we found it but could not open a device */
+ if (!device->dev->autoselect) {
+ Dmsg1(100, "Device %s not autoselect skipped.\n", devname.c_str());
+ continue; /* device is not available */
+ }
+ if (drive < 0 || drive == (int)device->dev->drive_index) {
+ Dmsg1(20, "Found changer device %s\n", device->hdr.name);
+ found = true;
+ break;
+ }
+ Dmsg3(100, "Device %s drive wrong: want=%d got=%d skipping\n",
+ devname.c_str(), drive, (int)device->dev->drive_index);
}
+ break; /* we found it but could not open a device */
}
}
if (found) {
- Dmsg1(100, "Found device %s\n", device->hdr.name);
+ Dmsg1(100, "Found changer device %s\n", device->hdr.name);
dcr = new_dcr(jcr, device->dev);
dcr->device = device;
jcr->dcr = dcr;
/* We freed the device, so reopen it and wake any waiting threads */
if (dev->open(dcr, OPEN_READ_ONLY) < 0) {
bnet_fsend(dir, _("3901 open device failed: ERR=%s\n"),
- dev->bstrerror());
+ strerror_dev(dev));
if (dev->dev_blocked == BST_UNMOUNTED) {
/* We blocked the device, so unblock it */
Dmsg0(100, "Unmounted. Unblocking device\n");
} else if (dev->is_tape()) {
if (dev->open(dcr, OPEN_READ_ONLY) < 0) {
bnet_fsend(dir, _("3901 open device failed: ERR=%s\n"),
- dev->bstrerror());
+ strerror_dev(dev));
break;
}
read_label(dcr);
dev->print_name());
}
} else if (dev->is_dvd()) {
- if (mount_dvd(dev, 1)) {
+ if (mount_dev(dev, 1)) {
bnet_fsend(dir, _("3002 Device %s is mounted.\n"),
dev->print_name());
} else {
- bnet_fsend(dir, _("3907 %s"), dev->bstrerror());
+ bnet_fsend(dir, _("3907 %s"), strerror_dev(dev));
}
} else { /* must be file */
bnet_fsend(dir, _("3906 File device %s is always mounted.\n"),
Dmsg2(90, "%d waiter dev_block=%d. doing unmount\n", dev->num_waiting,
dev->dev_blocked);
if (!unload_autochanger(jcr->dcr, -1)) {
- dev->close();
+ offline_or_rewind_dev(dev);
+ force_close_device(dev);
}
dev->dev_blocked = BST_UNMOUNTED_WAITING_FOR_SYSOP;
bnet_fsend(dir, _("3001 Device %s unmounted.\n"),
dev->dev_blocked = BST_UNMOUNTED;
dev->no_wait_id = 0;
if (!unload_autochanger(jcr->dcr, -1)) {
- dev->close();
+ offline_or_rewind_dev(dev);
+ force_close_device(dev);
}
bnet_fsend(dir, _("3002 Device %s unmounted.\n"),
dev->print_name());
}
-static bool bootstrap_cmd(JCR *jcr)
-{
- return get_bootstrap_file(jcr, jcr->dir_bsock);
-}
/*
* Autochanger command from Director
if (dcr) {
dev = dcr->dev;
P(dev->mutex); /* Use P to avoid indefinite block */
- if (!dev->device->changer_res) {
+ if (!dev->device->changer_res) {
bnet_fsend(dir, _("3995 Device %s is not an autochanger.\n"),
dev->print_name());
/* Under certain "safe" conditions, we can steal the lock */
P(dev->mutex); /* Use P to avoid indefinite block */
if (!dev->is_open()) {
read_volume_label(jcr, dev, Slot);
- dev->close();
+ force_close_device(dev);
/* Under certain "safe" conditions, we can steal the lock */
} else if (dev->can_steal_lock()) {
read_volume_label(jcr, dev, Slot);
return true;
}
-
/*
* Read the tape label
*
{
DCR *dcr = jcr->dcr;
BSOCK *dir = jcr->dir_bsock;
+ DEVICE *dev = dcr->dev;
bstrncpy(dcr->VolumeName, VolName, sizeof(dcr->VolumeName));
dcr->VolCatInfo.Slot = slot;
if (autoload_device(dcr, 0, dir) < 0) { /* autoload if possible */
return false;
}
+
+ /* Ensure that the device is open -- autoload_device() closes it */
+ if (dev->open(dcr, OPEN_READ_WRITE) < 0) {
+ bnet_fsend(dir, _("3910 Unable to open device %s: ERR=%s\n"),
+ dev->print_name(), dev->strerror());
+ return false;
+ }
return true;
}
projects / bacula / bacula / blobdiff