[Bacula-commits] bacula/src/stored dircmd.c,1.131,1.132

[Kern S. <ke...@us...>]

Update of /cvsroot/bacula/bacula/src/stored
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30488/src/stored

Modified Files:
	dircmd.c 
Log Message:
kes  At Eric's suggestion make both the slots and drive commands
     to the Storage daemon work even if the drive is busy.

Index: dircmd.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/dircmd.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- dircmd.c	2 Sep 2006 17:18:08 -0000	1.131
+++ dircmd.c	8 Sep 2006 13:38:53 -0000	1.132
@@ -904,17 +904,21 @@
    DCR *dcr;
    const char *cmd = NULL;
    bool ok = false;
-   bool dolist = false;
+   /*
+    * A safe_cmd may call autochanger script but does not load/unload
+    *    slots so it can be done at the same time that the drive is open.
+    */
+   bool safe_cmd = false;
 
    if (sscanf(dir->msg, "autochanger list %127s", devname.c_str()) == 1) {
       cmd = "list";
-      dolist = ok = true;
+      safe_cmd = ok = true;
    } else if (sscanf(dir->msg, "autochanger slots %127s", devname.c_str()) == 1) {
       cmd = "slots";
-      ok = true;
+      safe_cmd = ok = true;
    } else if (sscanf(dir->msg, "autochanger drives %127s", devname.c_str()) == 1) {
       cmd = "drives";
-      ok = true;
+      safe_cmd = ok = true;
    }
    if (ok) {
       dcr = find_device(jcr, devname, -1);
@@ -925,7 +929,7 @@
             bnet_fsend(dir, _("3995 Device %s is not an autochanger.\n"), 
                dev->print_name());
          /* Under certain "safe" conditions, we can steal the lock */
-         } else if (dolist || !dev->is_open() || dev->can_steal_lock()) {
+         } else if (safe_cmd || !dev->is_open() || dev->can_steal_lock()) {
             autochanger_cmd(dcr, dir, cmd);
          } else if (dev->is_busy() || dev->is_blocked()) {
             send_dir_busy_message(dir, dev);