]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/stored/dircmd.c
Add V: to bextract and bscan
[bacula/bacula] / bacula / src / stored / dircmd.c
index 344fdb5108b0242dbc12c8f8c3e4210cf9d59395..68d6b4d038981c42b275ceb02a18e93959d59721 100644 (file)
@@ -59,21 +59,21 @@ static char OKsetdebug[]   = "3000 OK setdebug=%d\n";
 /* Imported functions */
 extern void terminate_child();
 extern int job_cmd(JCR *jcr);
+extern int status_cmd(JCR *sjcr);
 
 /* Forward referenced functions */
 static int label_cmd(JCR *jcr);
 static int relabel_cmd(JCR *jcr);
+static int release_cmd(JCR *jcr);
 static int setdebug_cmd(JCR *jcr);
 static int cancel_cmd(JCR *cjcr);
 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, 
                               int Slot, int relabel);
-static void send_blocked_status(JCR *jcr, DEVICE *dev);
 
 struct s_cmds {
    char *cmd;
@@ -93,6 +93,7 @@ static struct s_cmds cmds[] = {
    {"unmount",   unmount_cmd},
    {"status",    status_cmd},
    {"autochanger", autochanger_cmd},
+   {"release",   release_cmd},
    {NULL,       NULL}                /* list terminator */
 };
 
@@ -174,9 +175,7 @@ void *connection_request(void *arg)
         break;
       }
    }
-   if (bnet_stat != BNET_TERMINATE) {
-      bnet_sig(bs, BNET_TERMINATE);
-   }
+   bnet_sig(bs, BNET_TERMINATE);
    free_jcr(jcr);
    return NULL;
 }
@@ -362,62 +361,64 @@ static void label_volume_if_ok(JCR *jcr, DEVICE *dev, char *oldname,
    
    steal_device_lock(dev, &hold, BST_WRITING_LABEL);
    
-   strcpy(jcr->VolumeName, newname);
+   pm_strcpy(&jcr->VolumeName, newname);
    jcr->VolCatInfo.Slot = slot;
    autoload_device(jcr, dev, 0, dir);     /* autoload if possible */
    block = new_block(dev);
 
-   /* Ensure that the device is open -- not autoload_device() closes it */
+   /* Ensure that the device is open -- autoload_device() closes it */
    for ( ; !(dev->state & ST_OPENED); ) {
-       if (open_dev(dev, jcr->VolumeName, READ_WRITE) < 0) {
-         if (dev->dev_errno == EAGAIN || dev->dev_errno == EBUSY) {
-            bmicrosleep(30, 0);
-         }
-          bnet_fsend(dir, _("3910 Unable to open device %s. ERR=%s\n"), 
-            dev_name(dev), strerror_dev(dev));
-         goto bail_out;
-       }
+      if (open_dev(dev, jcr->VolumeName, READ_WRITE) < 0) {
+        if (dev->dev_errno == EAGAIN || dev->dev_errno == EBUSY) {
+           bmicrosleep(30, 0);
+        }
+         bnet_fsend(dir, _("3910 Unable to open device %s. ERR=%s\n"), 
+           dev_name(dev), strerror_dev(dev));
+        goto bail_out;
+      }
    }
 
    /* See what we have for a Volume */
    switch (read_dev_volume_label(jcr, dev, block)) {               
-      case VOL_NAME_ERROR:
-      case VOL_VERSION_ERROR:
-      case VOL_LABEL_ERROR:
-      case VOL_OK:
-        if (!relabel) {
-           bnet_fsend(dir, _(
-               "3911 Cannot label Volume because it is already labeled: %s\n"), 
-               dev->VolHdr.VolName);
-           break;
-        }
-        /* Relabel request. If oldname matches, continue */
-        if (strcmp(oldname, dev->VolHdr.VolName) != 0) {
-            bnet_fsend(dir, _("Wrong volume mounted.\n"));
-           break;
-        }
-        /* Fall through wanted! */
-      case VOL_IO_ERROR:
-      case VOL_NO_LABEL:
-        if (!write_volume_label_to_dev(jcr, jcr->device, newname, poolname)) {
-            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);
+   case VOL_NAME_ERROR:
+   case VOL_VERSION_ERROR:
+   case VOL_LABEL_ERROR:
+   case VOL_OK:
+      if (!relabel) {
+        bnet_fsend(dir, _(
+            "3911 Cannot label Volume because it is already labeled: %s\n"), 
+            dev->VolHdr.VolName);
         break;
-      case VOL_NO_MEDIA:
+      }
+      /* Relabel request. If oldname matches, continue */
+      if (strcmp(oldname, dev->VolHdr.VolName) != 0) {
+         bnet_fsend(dir, _("Wrong volume mounted.\n"));
+        break;
+      }
+      /* Fall through wanted! */
+   case VOL_IO_ERROR:
+   case VOL_NO_LABEL:
+      if (!write_volume_label_to_dev(jcr, jcr->device, newname, poolname)) {
          bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), strerror_dev(dev));
         break;
-      default:
-         bnet_fsend(dir, _("3913 Cannot label Volume. \
+      }
+      pm_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, _("3913 Cannot label Volume. \
 Unknown status %d from read_volume_label()\n"), jcr->label_status);
-        break;
+      break;
    }
 bail_out:
    free_block(block);
-   return_device_lock(dev, &hold);
+   give_back_device_lock(dev, &hold);
+
+   return;
 }
 
 
@@ -431,30 +432,26 @@ static int read_label(JCR *jcr, DEVICE *dev)
    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);
    dev->state &= ~ST_LABEL;          /* force read of label */
    switch (read_dev_volume_label(jcr, dev, block)) {               
-      case VOL_OK:
-         bnet_fsend(dir, _("3001 Mounted Volume: %s\n"), dev->VolHdr.VolName);
-        stat = 1;
-        break;
-      default:
-         bnet_fsend(dir, _("3902 Cannot mount Volume on Storage Device \"%s\" because:\n%s\n"),
-           dev->dev_name, jcr->errmsg);
-        stat = 0;
-        break;
+   case VOL_OK:
+      bnet_fsend(dir, _("3001 Mounted Volume: %s\n"), dev->VolHdr.VolName);
+      stat = 1;
+      break;
+   default:
+      bnet_fsend(dir, _("3902 Cannot mount Volume on Storage Device \"%s\" because:\n%s\n"),
+        dev->dev_name, jcr->errmsg);
+      stat = 0;
+      break;
    }
    free_block(block);
-#ifndef NEW_LOCK
-   return_device_lock(dev, &hold);
-#endif
+   give_back_device_lock(dev, &hold);
    return stat;
 }
 
@@ -489,33 +486,74 @@ static int mount_cmd(JCR *jcr)
         P(dev->mutex);               /* Use P to avoid indefinite block */
         switch (dev->dev_blocked) {         /* device blocked? */
            DEV_BLOCK *block;
-           case BST_WAITING_FOR_SYSOP:
-              /* Someone is waiting, wake him */
-               Dmsg0(90, "Waiting for mount attempt to wake thread\n");
-              pthread_cond_signal(&dev->wait_next_vol);
-               bnet_fsend(dir, "3001 OK mount. Device=%s\n", dev->dev_name);
+        case BST_WAITING_FOR_SYSOP:
+           /* Someone is waiting, wake him */
+            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;
+
+        case BST_UNMOUNTED_WAITING_FOR_SYSOP:
+        case BST_UNMOUNTED:
+           /* We freed the device, so reopen it and wake any waiting threads */
+           if (open_dev(dev, NULL, READ_WRITE) < 0) {
+               bnet_fsend(dir, _("3901 open device failed: ERR=%s\n"), 
+                 strerror_dev(dev));
               break;
+           }
+           block = new_block(dev);
+           read_dev_volume_label(jcr, dev, block);
+           free_block(block);
+           if (dev->dev_blocked == BST_UNMOUNTED) {
+               Dmsg0(100, "Unmounted. Unblocking device\n");
+              read_label(jcr, dev);
+              unblock_device(dev);
+           } else {
+               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"), 
+                 dev->dev_name, dev->VolHdr.VolName);
+           } else {
+               bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"
+                                 "Try unmounting and remounting the Volume.\n"),
+                         dev->dev_name);
+           }
+           break;
+
+        case BST_DOING_ACQUIRE:
+            bnet_fsend(dir, _("3001 Device %s is mounted; doing acquire.\n"), 
+                      dev->dev_name);
+           break;
+
+        case BST_WRITING_LABEL:
+            bnet_fsend(dir, _("3903 Device %s is being labeled.\n"), dev->dev_name);
+           break;
 
-           case BST_UNMOUNTED_WAITING_FOR_SYSOP:
-           case BST_UNMOUNTED:
-              /* We freed the device, so reopen it and wake any waiting threads */
+        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"),
+                    dev->dev_name, dev->VolHdr.VolName);
+              } else {
+                  bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"   
+                                 "Try unmounting and remounting the Volume.\n"),
+                            dev->dev_name);
+              }
+           } else {
+              if (!dev_is_tape(dev)) {
+                  bnet_fsend(dir, _("3906 cannot mount non-tape.\n"));
+                 break;
+              }
               if (open_dev(dev, NULL, READ_WRITE) < 0) {
                   bnet_fsend(dir, _("3901 open device failed: ERR=%s\n"), 
                     strerror_dev(dev));
                  break;
               }
-              block = new_block(dev);
-              read_dev_volume_label(jcr, dev, block);
-              free_block(block);
-              if (dev->dev_blocked == BST_UNMOUNTED) {
-                  Dmsg0(90, "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;
-                 pthread_cond_signal(&dev->wait_next_vol);
-              }
+              read_label(jcr, dev);
               if (dev->state & ST_LABEL) {
                   bnet_fsend(dir, _("3001 Device %s is mounted with Volume \"%s\"\n"), 
                     dev->dev_name, dev->VolHdr.VolName);
@@ -524,52 +562,12 @@ static int mount_cmd(JCR *jcr)
                                     "Try unmounting and remounting the Volume.\n"),
                             dev->dev_name);
               }
-              break;
-
-           case BST_DOING_ACQUIRE:
-               bnet_fsend(dir, _("3001 Device %s is mounted; doing acquire.\n"), 
-                         dev->dev_name);
-              break;
-
-           case BST_WRITING_LABEL:
-               bnet_fsend(dir, _("3903 Device %s is being labeled.\n"), dev->dev_name);
-              break;
-
-           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"),
-                       dev->dev_name, dev->VolHdr.VolName);
-                 } else {
-                     bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"   
-                                    "Try unmounting and remounting the Volume.\n"),
-                               dev->dev_name);
-                 }
-              } else {
-                 if (!dev_is_tape(dev)) {
-                     bnet_fsend(dir, _("3906 cannot mount non-tape.\n"));
-                    break;
-                 }
-                 if (open_dev(dev, NULL, READ_WRITE) < 0) {
-                     bnet_fsend(dir, _("3901 open device failed: ERR=%s\n"), 
-                       strerror_dev(dev));
-                    break;
-                 }
-                 read_label(jcr, dev);
-                 if (dev->state & ST_LABEL) {
-                     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"
-                                       "Try unmounting and remounting the Volume.\n"),
-                               dev->dev_name);
-                 }
-              }
-              break;
+           }
+           break;
 
-           default:
-               bnet_fsend(dir, _("3905 Bizarre wait state %d\n"), dev->dev_blocked);
-              break;
+        default:
+            bnet_fsend(dir, _("3905 Bizarre wait state %d\n"), dev->dev_blocked);
+           break;
         }
         V(dev->mutex);
       } else {
@@ -620,9 +618,8 @@ static int unmount_cmd(JCR *jcr)
         } else if (dev->dev_blocked == BST_WAITING_FOR_SYSOP) {
             Dmsg2(90, "%d waiter dev_block=%d. doing unmount\n", dev->num_waiting,
               dev->dev_blocked);
-           if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
-              offline_dev(dev);
-           }
+           open_dev(dev, NULL, 0);     /* fake open for close */
+           offline_or_rewind_dev(dev);
            force_close_dev(dev);
            dev->dev_blocked = BST_UNMOUNTED_WAITING_FOR_SYSOP;
             bnet_fsend(dir, _("3001 Device %s unmounted.\n"), dev_name(dev));
@@ -648,10 +645,16 @@ static int unmount_cmd(JCR *jcr)
 
         } else {                     /* device not being used */
             Dmsg0(90, "Device not in use, unmounting\n");
-           block_device(dev, BST_UNMOUNTED);
-           if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
-              offline_dev(dev);
-           }
+           /* On FreeBSD, I am having ASSERT() failures in block_device()
+            * and I can only imagine that the thread id that we are
+            * leaving in no_wait_id is being re-used. So here,
+            * we simply do it by hand.  Gross, but maybe a solutions
+            */
+           /*  block_device(dev, BST_UNMOUNTED); replace with 2 lines below */
+           dev->dev_blocked = BST_UNMOUNTED;
+           dev->no_wait_id = 0;
+           open_dev(dev, NULL, 0);     /* fake open for close */
+           offline_or_rewind_dev(dev);
            force_close_dev(dev);
             bnet_fsend(dir, _("3002 Device %s unmounted.\n"), dev_name(dev));
         }
@@ -670,145 +673,88 @@ static int unmount_cmd(JCR *jcr)
 }
 
 /*
- * Status command from Director
+ * Release command from Director. This rewinds the device and if
+ *   configured does a offline and ensures that Bacula will
+ *   re-read the label of the tape before continuing. This gives
+ *   the operator the chance to change the tape anytime before the
+ *   next job starts.
  */
-static int status_cmd(JCR *jcr)
+static int release_cmd(JCR *jcr)
 {
+   POOLMEM *dname;
+   BSOCK *dir = jcr->dir_bsock;
    DEVRES *device;
    DEVICE *dev;
-   int found, bps, sec, bpb;
-   BSOCK *user = jcr->dir_bsock;
-   char dt[MAX_TIME_LENGTH];
-   char b1[30], b2[30], b3[30];
-
-   bnet_fsend(user, "\n%s Version: " VERSION " (" BDATE ")\n", my_name);
-   bstrftime(dt, sizeof(dt), daemon_start_time);
-   bnet_fsend(user, _("Daemon started %s, %d Job%s run.\n"), dt, last_job.NumJobs,
-        last_job.NumJobs == 1 ? "" : "s");
-   if (last_job.NumJobs > 0) {
-      char termstat[30];
-
-      bstrftime(dt, sizeof(dt), last_job.end_time);
-      bnet_fsend(user, _("Last Job %s finished at %s\n"), last_job.Job, dt);
-
-      jobstatus_to_ascii(last_job.JobStatus, termstat, sizeof(termstat));
-      bnet_fsend(user, _("  Files=%s Bytes=%s Termination Status=%s\n"), 
-          edit_uint64_with_commas(last_job.JobFiles, b1),
-          edit_uint64_with_commas(last_job.JobBytes, b2),
-          termstat);
-   }
+   int found = 0;
 
-   LockRes();
-   for (device=NULL;  (device=(DEVRES *)GetNextRes(R_DEVICE, (RES *)device)); ) {
-      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"), 
-                 dev_name(dev), dev->VolHdr.VolName);
-           } else {
-               bnet_fsend(user, _("Device %s open but no Bacula volume is mounted.\n"), dev_name(dev));
-           }
-           send_blocked_status(jcr, dev);
-           bpb = dev->VolCatInfo.VolCatBlocks;
-           if (bpb <= 0) {
-              bpb = 1;
-           }
-           bpb = dev->VolCatInfo.VolCatBytes / bpb;
-            bnet_fsend(user, _("    Total Bytes=%s Blocks=%s Bytes/block=%s\n"),
-              edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, b1),
-              edit_uint64_with_commas(dev->VolCatInfo.VolCatBlocks, b2), 
-              edit_uint64_with_commas(bpb, b3));
-            bnet_fsend(user, _("    Positioned at File=%s Block=%s\n"), 
-              edit_uint64_with_commas(dev->file, b1),
-              edit_uint64_with_commas(dev->block_num, b2));
-
-        } else {
-            bnet_fsend(user, _("Device %s is not open.\n"), dev_name(dev));
-           send_blocked_status(jcr, dev);
-        }
-      }
-   }
-   UnlockRes();
-
-   found = 0;
-   lock_jcr_chain();
-   /* NOTE, we reuse a calling argument jcr. Be warned! */ 
-   for (jcr=NULL; (jcr=get_next_jcr(jcr)); ) {
-      if (jcr->JobStatus == JS_WaitFD) {
-         bnet_fsend(user, _("%s Job %s waiting for Client connection.\n"),
-           job_type_to_str(jcr->JobType), jcr->Job);
-      }
-      if (jcr->device) {
-         bnet_fsend(user, _("%s %s job %s is using device %s volume %s\n"), 
-                  job_level_to_str(jcr->JobLevel),
-                  job_type_to_str(jcr->JobType),
-                  jcr->Job, jcr->device->device_name,
-                  jcr->VolumeName);
-        sec = time(NULL) - jcr->run_time;
-        if (sec <= 0) {
-           sec = 1;
-        }
-        bps = jcr->JobBytes / sec;
-         bnet_fsend(user, _("    Files=%s Bytes=%s Bytes/sec=%s\n"), 
-           edit_uint64_with_commas(jcr->JobFiles, b1),
-           edit_uint64_with_commas(jcr->JobBytes, b2),
-           edit_uint64_with_commas(bps, b3));
-        found = 1;
-#ifdef DEBUG
-        if (jcr->file_bsock) {
-            bnet_fsend(user, "    FDReadSeqNo=%" lld " fd=%d\n", 
-              jcr->file_bsock->read_seqno, jcr->file_bsock->fd);
-        } else {
-            bnet_fsend(user, "    FDSocket closed\n");
+   dname = get_memory(dir->msglen+1);
+   if (sscanf(dir->msg, "release %s", dname) == 1) {
+      unbash_spaces(dname);
+      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, dname) == 0 && device->dev) {
+            Dmsg1(20, "Found device %s\n", device->hdr.name);
+           found = 1;
+           break;
         }
-#endif
       }
-      free_locked_jcr(jcr);
-   }
-   unlock_jcr_chain();
-   if (!found) {
-      bnet_fsend(user, _("No jobs running.\n"));
-   }
+      UnlockRes();
+      if (found) {
+        jcr->device = device;
+        dev = device->dev;
+        P(dev->mutex);               /* Use P to avoid indefinite block */
+        if (!(dev->state & ST_OPENED)) {
+            Dmsg0(90, "Device already released\n");
+            bnet_fsend(dir, _("3911 Device %s already released.\n"), dev_name(dev));
 
-#ifdef full_status
-   bnet_fsend(user, "\n\n");
-   dump_resource(R_DEVICE, resources[R_DEVICE-r_first].res_head, sendit, user);
-#endif
-   bnet_fsend(user, "====\n");
+        } else if (dev->dev_blocked == BST_WAITING_FOR_SYSOP ||
+                   dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP) {
+            Dmsg2(90, "%d waiter dev_block=%d. doing unmount\n", dev->num_waiting,
+              dev->dev_blocked);
+            bnet_fsend(dir, _("3912 Device %s waiting for mount.\n"), dev_name(dev));
 
-   bnet_sig(user, BNET_EOD);
-   return 1;
-}
+        } else if (dev->dev_blocked == BST_DOING_ACQUIRE) {
+            bnet_fsend(dir, _("3913 Device %s is busy in acquire.\n"),
+              dev_name(dev));
 
-static void send_blocked_status(JCR *jcr, DEVICE *dev) 
-{
-   BSOCK *user = jcr->dir_bsock;
+        } else if (dev->dev_blocked == BST_WRITING_LABEL) {
+            bnet_fsend(dir, _("3914 Device %s is being labeled.\n"),
+              dev_name(dev));
 
-   switch (dev->dev_blocked) {
-      case BST_UNMOUNTED:
-         bnet_fsend(user, _("    Device is BLOCKED. User unmounted.\n"));
-        break;
-      case BST_UNMOUNTED_WAITING_FOR_SYSOP:
-         bnet_fsend(user, _("    Device is BLOCKED. User unmounted during wait for media/mount.\n"));
-        break;
-      case BST_WAITING_FOR_SYSOP:
-        if (jcr->JobStatus == JS_WaitMount) {
-            bnet_fsend(user, _("    Device is BLOCKED waiting for mount.\n"));
-        } else {
-            bnet_fsend(user, _("    Device is BLOCKED waiting for appendable media.\n"));
+        } else if (dev->state & ST_READ || dev->num_writers) {
+           if (dev->state & ST_READ) {
+                Dmsg0(90, "Device in read mode\n");
+                bnet_fsend(dir, _("3915 Device %s is busy with 1 reader.\n"),
+                  dev_name(dev));
+           } else {
+                Dmsg1(90, "Device busy with %d writers\n", dev->num_writers);
+                bnet_fsend(dir, _("3916 Device %s is busy with %d writer(s).\n"),
+                  dev_name(dev), dev->num_writers);
+           }
+
+        } else {                     /* device not being used */
+            Dmsg0(90, "Device not in use, unmounting\n");
+           release_volume(jcr, dev);
+            bnet_fsend(dir, _("3012 Device %s released.\n"), dev_name(dev));
         }
-        break;
-      case BST_DOING_ACQUIRE:
-         bnet_fsend(user, _("    Device is being initialized.\n"));
-        break;
-      case BST_WRITING_LABEL:
-         bnet_fsend(user, _("    Device is blocked labeling a Volume.\n"));
-        break;
-      default:
-        break;
+        V(dev->mutex);
+      } else {
+         bnet_fsend(dir, _("3999 Device %s not found\n"), dname);
+      }
+   } else {
+      /* NB dir->msg gets clobbered in bnet_fsend, so save command */
+      pm_strcpy(&jcr->errmsg, dir->msg);
+      bnet_fsend(dir, _("3917 Error scanning release command: %s\n"), jcr->errmsg);
    }
+   free_memory(dname);
+   bnet_sig(dir, BNET_EOD);
+   return 1;
 }
 
+
+
 /*
  * Autochanger command from Director
  */
@@ -838,7 +784,10 @@ static int autochanger_cmd(JCR *jcr)
         jcr->device = device;
         dev = device->dev;
         P(dev->mutex);               /* Use P to avoid indefinite block */
-        if (!(dev->state & ST_OPENED)) {
+        if (!dev_is_tape(dev)) {
+            bnet_fsend(dir, _("3995 Device %s is not an autochanger.\n"), 
+              dev_name(dev));
+        } else 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 {
@@ -866,7 +815,7 @@ static int autochanger_cmd(JCR *jcr)
       } else {
          bnet_fsend(dir, _("3999 Device %s not found\n"), devname);
       }
-   } else {
+   } else {  /* error on scanf */
       pm_strcpy(&jcr->errmsg, dir->msg);
       bnet_fsend(dir, _("3907 Error scanning autocharger list command: %s\n"),
         jcr->errmsg);