kes Move the checking of the database in initializion of the Director

[bacula/bacula] / bacula / src / stored / autochanger.c

diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c
index f42ce5db8b7cceb9b15a7250303e9fe0e1fed348..977ff5706cfbce0547a5ce59860a45a122647647 100644 (file)
--- a/bacula/src/stored/autochanger.c
+++ b/bacula/src/stored/autochanger.c
@@ -121,6 +121,12 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir)
       Dmsg1(200, "Device %s is not an autochanger\n", dev->print_name());
       return 0;
    }
+
+   /* An empty ChangerCommand => virtual disk autochanger */
+   if (dcr->device->changer_command && dcr->device->changer_command[0] == 0) {
+      return 1;                       /* nothing to load */
+   }
+
    slot = dcr->VolCatInfo.InChanger ? dcr->VolCatInfo.Slot : 0;
    /*
     * Handle autoloaders here.  If we cannot autoload it, we
@@ -241,9 +247,13 @@ int get_autochanger_loaded_slot(DCR *dcr)
       Jmsg(jcr, M_FATAL, 0, _("3992 Missing Changer command.\n"));
       return -1;
    }
-   if (dev->Slot >0) {
+   if (dev->Slot > 0) {
       return dev->Slot;
    }
+   /* Virtual disk autochanger */
+   if (dcr->device->changer_command[0] ==0) {
+      return 1;
+   }
 
    /* Find out what is loaded, zero means device is unloaded */
    changer = get_pool_memory(PM_FNAME);
@@ -404,14 +414,14 @@ static bool unload_other_drive(DCR *dcr, int slot)
       }
       break;
    }
-   P(dev->mutex);
+   dev->lock();  
    if (dev->is_busy()) {
       Jmsg(jcr, M_WARNING, 0, _("Volume \"%s\" is in use by device %s\n"),
            dcr->VolumeName, dev->print_name());
       Dmsg4(100, "Vol %s for dev=%s is busy dev=%s slot=%d\n",
            dcr->VolumeName, dcr->dev->print_name(), dev->print_name(), slot);
       Dmsg2(100, "num_writ=%d reserv=%d\n", dev->num_writers, dev->reserved_device);
-      V(dev->mutex);
+      dev->unlock();
       return false;
    }
 
@@ -453,7 +463,7 @@ static bool unload_other_drive(DCR *dcr, int slot)
       Dmsg0(100, "Slot unloaded\n");
    }
    unlock_changer(dcr);
-   V(dev->mutex);
+   dev->unlock();
    free_pool_memory(changer_cmd);
    return ok;
 }