kes If operator has rewind tape, print warning, release tape and

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

diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c
index 3416c632917f91c110ecf6f3f86dba0acbea39c1..e798d9fa6865ae4d5fbfb10ca420ccd7ef9f9199 100644 (file)
--- a/bacula/src/stored/autochanger.c
+++ b/bacula/src/stored/autochanger.c
@@ -118,16 +118,19 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir)
    POOLMEM *changer;
 
    if (!dev->is_autochanger()) {
-      Dmsg1(200, "Device %s is not an autochanger\n", dev->print_name());
+      Dmsg1(100, "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) {
+      Dmsg0(100, "ChangerCommand=0, virtual disk changer\n");
       return 1;                       /* nothing to load */
    }
 
    slot = dcr->VolCatInfo.InChanger ? dcr->VolCatInfo.Slot : 0;
+   Dmsg3(100, "autoload: slot=%d InChgr=%d Vol=%s\n", dcr->VolCatInfo.Slot,
+         dcr->VolCatInfo.InChanger, dcr->VolCatInfo.VolCatName);
    /*
     * Handle autoloaders here.  If we cannot autoload it, we
     *  will return 0 so that the sysop will be asked to load it.
@@ -136,6 +139,7 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir)
       if (dir) {
          return 0;                    /* For user, bail out right now */
       }
+      /* ***FIXME*** this really should not be here */
       if (dir_find_next_appendable_volume(dcr)) {
          slot = dcr->VolCatInfo.InChanger ? dcr->VolCatInfo.Slot : 0;
       } else {
@@ -183,7 +187,7 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir)
           * Load the desired cassette
           */
          lock_changer(dcr);
-         Dmsg1(100, "Doing changer load slot %d\n", slot);
+         Dmsg2(100, "Doing changer load slot %d %s\n", slot, dev->print_name());
          Jmsg(jcr, M_INFO, 0,
               _("3304 Issuing autochanger \"load slot %d, drive %d\" command.\n"),
               slot, drive);
@@ -248,7 +252,7 @@ int get_autochanger_loaded_slot(DCR *dcr)
       return -1;
    }
    if (!dcr->device->changer_command) {
-      Jmsg(jcr, M_FATAL, 0, _("3992 Missing Changer command.\n"));
+//    Jmsg(jcr, M_FATAL, 0, _("3992 Missing Changer command.\n"));
       return -1;
    }
    if (dev->Slot > 0) {
@@ -334,6 +338,7 @@ bool unload_autochanger(DCR *dcr, int loaded)
 
    /* Virtual disk autochanger */
    if (dcr->device->changer_command[0] == 0) {
+      dev->clear_unload();
       return true;
    }
 
@@ -367,10 +372,12 @@ bool unload_autochanger(DCR *dcr, int loaded)
       } else {
          dev->Slot = 0;            /* nothing loaded */
       }
+      unlock_changer(dcr);
+
       free_volume(dev);            /* Free any volume associated with this drive */
       free_pool_memory(changer);
-      unlock_changer(dcr);
    }
+   dev->clear_unload();
    return ok;
 }
 
@@ -421,7 +428,7 @@ static bool unload_other_drive(DCR *dcr, int slot)
            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(), dev->Slot);
-      Dmsg2(100, "num_writ=%d reserv=%d\n", dev->num_writers, dev->reserved_device);
+      Dmsg2(100, "num_writ=%d reserv=%d\n", dev->num_writers, dev->num_reserved());
       return false;
    }
    return unload_dev(dcr, dev);
@@ -436,7 +443,7 @@ bool unload_dev(DCR *dcr, DEVICE *dev)
    DEVICE *save_dev;
    int save_slot;
 
-   if (!changer) {
+   if (!changer || dev->Slot <= 0) {
       return false;
    }
    dev->dlock();
@@ -459,7 +466,7 @@ bool unload_dev(DCR *dcr, DEVICE *dev)
                 dcr->device->changer_command, "unload");
    dev->close();
    Dmsg2(200, "close dev=%s reserve=%d\n", dev->print_name(), 
-      dev->reserved_device);
+      dev->num_reserved());
    Dmsg1(100, "Run program=%s\n", changer_cmd);
    int stat = run_program_full_output(changer_cmd, timeout, results.addr());
    dcr->VolCatInfo.Slot = save_slot;
@@ -475,12 +482,15 @@ bool unload_dev(DCR *dcr, DEVICE *dev)
       ok = false;
       dev->Slot = -1;          /* unknown */
    } else {
+      Dmsg2(100, "Slot %d unloaded %s\n", dev->Slot, dev->print_name());
       dev->Slot = 0;           /* nothing loaded */
-      Dmsg0(100, "Slot unloaded\n");
    }
-   free_volume(dev);               /* Free any volume associated with this drive */
+   dev->clear_unload();
    unlock_changer(dcr);
+
    dev->dunlock();
+
+   free_volume(dev);               /* Free any volume associated with this drive */
    free_pool_memory(changer_cmd);
    return ok;
 }