static int mount_cmd(JCR *jcr);
static int unmount_cmd(JCR *jcr);
static int status_cmd(JCR *sjcr);
+static int autochanger_cmd(JCR *sjcr);
static int do_label(JCR *jcr, int relabel);
static void label_volume_if_ok(JCR *jcr, DEVICE *dev, char *oldname,
char *newname, char *poolname,
{"mount", mount_cmd},
{"unmount", unmount_cmd},
{"status", status_cmd},
+ {"autochanger", autochanger_cmd},
{NULL, NULL} /* list terminator */
};
char name[MAX_NAME_LENGTH];
if (bnet_recv(bs) <= 0) {
- Emsg0(M_ERROR, 0, "Connection request failed.\n");
+ Emsg0(M_ERROR, 0, _("Connection request failed.\n"));
return NULL;
}
/*
* See if this is a File daemon connection
*/
+ if (bs->msglen < 25 || bs->msglen > (int)sizeof(name)+25) {
+ Emsg1(M_ERROR, 0, _("Invalid Dir connection. Len=%d\n"), bs->msglen);
+ }
if (sscanf(bs->msg, "Hello Start Job %127s calling\n", name) == 1) {
handle_filed_connection(bs, name);
return NULL;
Dmsg0(90, "Message channel init completed.\n");
for (quit=0; !quit;) {
-
/* Read command */
if ((bnet_stat = bnet_recv(bs)) <= 0) {
break; /* connection terminated */
} else {
P(jcr->mutex);
oldStatus = jcr->JobStatus;
- set_jcr_job_status(jcr, JS_Cancelled);
+ set_jcr_job_status(jcr, JS_Canceled);
if (!jcr->authenticated && oldStatus == JS_WaitFD) {
pthread_cond_signal(&jcr->job_start_wait); /* wake waiting thread */
}
jcr->device->dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP)) {
pthread_cond_signal(&jcr->device->dev->wait_next_vol);
}
- bnet_fsend(dir, _("3000 Job %s marked to be cancelled.\n"), jcr->Job);
+ bnet_fsend(dir, _("3000 Job %s marked to be canceled.\n"), jcr->Job);
free_jcr(jcr);
}
} else {
}
} else {
/* NB dir->msg gets clobbered in bnet_fsend, so save command */
- strcpy(dname, dir->msg);
- bnet_fsend(dir, _("3903 Error scanning label command: %s\n"), dname);
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ bnet_fsend(dir, _("3903 Error scanning label command: %s\n"), jcr->errmsg);
}
free_memory(dname);
free_memory(oldname);
for ( ; !(dev->state & ST_OPENED); ) {
if (open_dev(dev, jcr->VolumeName, READ_WRITE) < 0) {
if (dev->dev_errno == EAGAIN || dev->dev_errno == EBUSY) {
- sleep(30);
+ bmicrosleep(30, 0);
}
- bnet_fsend(dir, _("3903 Unable to open device %s. ERR=%s\n"),
+ bnet_fsend(dir, _("3910 Unable to open device %s. ERR=%s\n"),
dev_name(dev), strerror_dev(dev));
goto bail_out;
}
case VOL_OK:
if (!relabel) {
bnet_fsend(dir, _(
- "3901 Cannot label Volume because it is already labeled: %s\n"),
+ "3911 Cannot label Volume because it is already labeled: %s\n"),
dev->VolHdr.VolName);
break;
}
case VOL_IO_ERROR:
case VOL_NO_LABEL:
if (!write_volume_label_to_dev(jcr, jcr->device, newname, poolname)) {
- bnet_fsend(dir, _("3903 Failed to label Volume: ERR=%s\n"), strerror_dev(dev));
+ bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), strerror_dev(dev));
break;
}
strcpy(jcr->VolumeName, newname);
bnet_fsend(dir, _("3000 OK label. Volume=%s Device=%s\n"),
newname, dev->dev_name);
break;
+ case VOL_NO_MEDIA:
+ bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), strerror_dev(dev));
+ break;
default:
- bnet_fsend(dir, _("3902 Cannot label Volume. \
+ bnet_fsend(dir, _("3913 Cannot label Volume. \
Unknown status %d from read_volume_label()\n"), jcr->label_status);
break;
}
int stat;
BSOCK *dir = jcr->dir_bsock;
DEV_BLOCK *block;
-#ifndef NEW_LOCK
bsteal_lock_t hold;
steal_device_lock(dev, &hold, BST_DOING_ACQUIRE);
-#endif
jcr->VolumeName[0] = 0;
block = new_block(dev);
break;
}
free_block(block);
-#ifndef NEW_LOCK
return_device_lock(dev, &hold);
-#endif
return stat;
}
*/
static int mount_cmd(JCR *jcr)
{
- char *dev_name;
+ POOLMEM *dev_name;
BSOCK *dir = jcr->dir_bsock;
DEVRES *device;
DEVICE *dev;
int found = 0;
- dev_name = (char *) get_memory(dir->msglen);
+ dev_name = get_memory(dir->msglen+1);
if (sscanf(dir->msg, "mount %s", dev_name) == 1) {
unbash_spaces(dev_name);
device = NULL;
DEV_BLOCK *block;
case BST_WAITING_FOR_SYSOP:
/* Someone is waiting, wake him */
- Dmsg0(90, "Waiting for mount attempt to wake thread\n");
+ Dmsg0(100, "Waiting for mount. Attempting to wake thread\n");
+ dev->dev_blocked = BST_MOUNT;
pthread_cond_signal(&dev->wait_next_vol);
bnet_fsend(dir, "3001 OK mount. Device=%s\n", dev->dev_name);
break;
read_dev_volume_label(jcr, dev, block);
free_block(block);
if (dev->dev_blocked == BST_UNMOUNTED) {
- Dmsg0(90, "Unmounted unblocking device\n");
+ Dmsg0(100, "Unmounted. Unblocking device\n");
read_label(jcr, dev);
unblock_device(dev);
} else {
- Dmsg0(90, "Unmounted waiting for mount attempt to wake thread\n");
- dev->dev_blocked = BST_WAITING_FOR_SYSOP;
+ Dmsg0(100, "Unmounted waiting for mount. Attempting to wake thread\n");
+ dev->dev_blocked = BST_MOUNT;
pthread_cond_signal(&dev->wait_next_vol);
}
if (dev->state & ST_LABEL) {
- bnet_fsend(dir, _("3001 Device %s is mounted with Volume %s\n"),
+ bnet_fsend(dir, _("3001 Device %s is mounted with Volume \"%s\"\n"),
dev->dev_name, dev->VolHdr.VolName);
} else {
bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"
case BST_NOT_BLOCKED:
if (dev->state & ST_OPENED) {
if (dev->state & ST_LABEL) {
- bnet_fsend(dir, _("3001 Device %s is mounted with Volume %s\n"),
+ bnet_fsend(dir, _("3001 Device %s is mounted with Volume \"%s\"\n"),
dev->dev_name, dev->VolHdr.VolName);
} else {
bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"
}
read_label(jcr, dev);
if (dev->state & ST_LABEL) {
- bnet_fsend(dir, _("3001 Device %s is mounted with Volume %s\n"),
+ bnet_fsend(dir, _("3001 Device %s is mounted with Volume \"%s\"\n"),
dev->dev_name, dev->VolHdr.VolName);
} else {
bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"
bnet_fsend(dir, _("3999 Device %s not found\n"), dev_name);
}
} else {
- strcpy(dev_name, dir->msg);
- bnet_fsend(dir, _("3906 Error scanning mount command: %s\n"), dev_name);
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ bnet_fsend(dir, _("3906 Error scanning mount command: %s\n"), jcr->errmsg);
}
free_memory(dev_name);
bnet_sig(dir, BNET_EOD);
*/
static int unmount_cmd(JCR *jcr)
{
- char *dname;
+ POOLMEM *dname;
BSOCK *dir = jcr->dir_bsock;
DEVRES *device;
DEVICE *dev;
int found = 0;
- dname = (char *) get_memory(dir->msglen+1);
+ dname = get_memory(dir->msglen+1);
if (sscanf(dir->msg, "unmount %s", dname) == 1) {
unbash_spaces(dname);
device = NULL;
}
} else {
/* NB dir->msg gets clobbered in bnet_fsend, so save command */
- strcpy(dname, dir->msg);
- bnet_fsend(dir, _("3907 Error scanning unmount command: %s\n"), dname);
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ bnet_fsend(dir, _("3907 Error scanning unmount command: %s\n"), jcr->errmsg);
}
free_memory(dname);
bnet_sig(dir, BNET_EOD);
for (dev=device->dev; dev; dev=dev->next) {
if (dev->state & ST_OPENED) {
if (dev->state & ST_LABEL) {
- bnet_fsend(user, _("Device %s is mounted with Volume %s\n"),
+ bnet_fsend(user, _("Device %s is mounted with Volume \"%s\"\n"),
dev_name(dev), dev->VolHdr.VolName);
} else {
bnet_fsend(user, _("Device %s open but no Bacula volume is mounted.\n"), dev_name(dev));
break;
}
}
+
+/*
+ * Autochanger command from Director
+ */
+static int autochanger_cmd(JCR *jcr)
+{
+ POOLMEM *devname;
+ BSOCK *dir = jcr->dir_bsock;
+ DEVRES *device;
+ DEVICE *dev;
+ int found = 0;
+
+ devname = get_memory(dir->msglen+1);
+ if (sscanf(dir->msg, "autochanger list %s ", devname) == 1) {
+ unbash_spaces(devname);
+ device = NULL;
+ LockRes();
+ while ((device=(DEVRES *)GetNextRes(R_DEVICE, (RES *)device))) {
+ /* Find resource, and make sure we were able to open it */
+ if (strcmp(device->hdr.name, devname) == 0 && device->dev) {
+ Dmsg1(20, "Found device %s\n", device->hdr.name);
+ found = 1;
+ break;
+ }
+ }
+ UnlockRes();
+ if (found) {
+ jcr->device = device;
+ dev = device->dev;
+ P(dev->mutex); /* Use P to avoid indefinite block */
+ if (!(dev->state & ST_OPENED)) {
+ if (open_dev(dev, NULL, READ_WRITE) < 0) {
+ bnet_fsend(dir, _("3994 Connot open device: %s\n"), strerror_dev(dev));
+ } else {
+ autochanger_list(jcr, dev, dir);
+ force_close_dev(dev);
+ }
+ /* Under certain "safe" conditions, we can steal the lock */
+ } else if (dev->dev_blocked &&
+ (dev->dev_blocked == BST_UNMOUNTED ||
+ dev->dev_blocked == BST_WAITING_FOR_SYSOP ||
+ dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP)) {
+ autochanger_list(jcr, dev, dir);
+ } else if (dev->state & ST_READ || dev->num_writers) {
+ if (dev->state & ST_READ) {
+ bnet_fsend(dir, _("3901 Device %s is busy with 1 reader.\n"),
+ dev_name(dev));
+ } else {
+ bnet_fsend(dir, _("3902 Device %s is busy with %d writer(s).\n"),
+ dev_name(dev), dev->num_writers);
+ }
+ } else { /* device not being used */
+ autochanger_list(jcr, dev, dir);
+ }
+ V(dev->mutex);
+ } else {
+ bnet_fsend(dir, _("3999 Device %s not found\n"), devname);
+ }
+ } else {
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ bnet_fsend(dir, _("3907 Error scanning autocharger list command: %s\n"),
+ jcr->errmsg);
+ }
+ free_memory(devname);
+ bnet_sig(dir, BNET_EOD);
+ return 1;
+}
projects / bacula / bacula / blobdiff