Fix bug #1542 File Daemon outputs usage message to stdout instead of stderr

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

diff --git a/bacula/src/stored/vol_mgr.c b/bacula/src/stored/vol_mgr.c
index 95d906ad9fa9c5840b7b40867580936a4c251abe..5bc9ba840d8dad70f553b1aef29c4972b34daefb 100644 (file)
--- a/bacula/src/stored/vol_mgr.c
+++ b/bacula/src/stored/vol_mgr.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -44,11 +44,12 @@ const int dbglvl =  150;
 static dlist *vol_list = NULL;
 static brwlock_t vol_list_lock;
 static dlist *read_vol_list = NULL;
-static pthread_mutex_t read_vol_lock = PTHREAD_MUTEX_INITIALIZER;
+static bthread_mutex_t read_vol_lock = BTHREAD_MUTEX_PRIORITY(PRIO_SD_READ_VOL_LIST);
 
 /* Forward referenced functions */
 static void free_vol_item(VOLRES *vol);
 static VOLRES *new_vol_item(DCR *dcr, const char *VolumeName);
+static void debug_list_volumes(const char *imsg);
 
 /*
  * For append volumes the key is the VolumeName.
@@ -89,7 +90,7 @@ int vol_list_lock_count = 0;
 void init_vol_list_lock()
 {
    int errstat;
-   if ((errstat=rwl_init(&vol_list_lock)) != 0) {
+   if ((errstat=rwl_init(&vol_list_lock, PRIO_SD_VOL_LIST)) != 0) {
       berrno be;
       Emsg1(M_ABORT, 0, _("Unable to initialize volume list lock. ERR=%s\n"),
             be.bstrerror(errstat));
@@ -101,8 +102,6 @@ void term_vol_list_lock()
    rwl_destroy(&vol_list_lock);
 }
 
-
-
 /* 
  * This allows a given thread to recursively call to lock_volumes()
  */
@@ -179,7 +178,6 @@ void remove_read_volume(JCR *jcr, const char *VolumeName)
    if (fvol) {
       Dmsg3(dbglvl, "remove_read_vol=%s JobId=%d found=%d\n", VolumeName, jcr->JobId, fvol!=NULL);
    }
-   debug_list_volumes("remove_read_volume");
    if (fvol) {
       read_vol_list->remove(fvol);
       free_vol_item(fvol);
@@ -195,7 +193,7 @@ enum {
    debug_nolock = false
 };
 
-void debug_list_volumes(const char *imsg)
+static void debug_list_volumes(const char *imsg)
 {
    VOLRES *vol;
    POOL_MEM msg(PM_MESSAGE);
@@ -344,6 +342,9 @@ VOLRES *reserve_volume(DCR *dcr, const char *VolumeName)
    VOLRES *vol, *nvol;
    DEVICE * volatile dev = dcr->dev;
 
+   if (job_canceled(dcr->jcr)) {
+      return NULL;
+   }
    ASSERT(dev != NULL);
 
    Dmsg2(dbglvl, "enter reserve_volume=%s drive=%s\n", VolumeName, 
@@ -380,9 +381,12 @@ VOLRES *reserve_volume(DCR *dcr, const char *VolumeName)
             goto get_out;
          }
          Dmsg2(dbglvl, "reserve_vol free vol=%s at %p\n", vol->vol_name, vol->vol_name);
-         free_volume(dev);
-         Dmsg0(50, "set_unload\n");
-         dev->set_unload();             /* have to unload current volume */
+         /* If old Volume is still mounted, must unload it */
+         if (strcmp(vol->vol_name, dev->VolHdr.VolumeName) == 0) {
+            Dmsg0(50, "set_unload\n");
+            dev->set_unload();          /* have to unload current volume */
+         }
+         free_volume(dev);              /* Release old volume entry */
          debug_list_volumes("reserve_vol free");
       }
    }
@@ -410,6 +414,10 @@ VOLRES *reserve_volume(DCR *dcr, const char *VolumeName)
       nvol->dev = NULL;                  /* don't zap dev entry */
       free_vol_item(nvol);
 
+      if (vol->dev) {
+         Dmsg2(dbglvl, "dev=%s vol->dev=%s\n", dev->print_name(), vol->dev->print_name());
+      }
+         
       /*
        * Check if we are trying to use the Volume on a different drive
        *  dev      is our device
@@ -436,8 +444,15 @@ VOLRES *reserve_volume(DCR *dcr, const char *VolumeName)
             vol->dev = dev;              /* point the Volume at our drive */
             dev->vol = vol;              /* point our drive at the Volume */
          } else {
-            Dmsg3(dbglvl, "==== Swap not possible Vol busy vol=%s from dev=%s to %s\n", 
+            Dmsg5(dbglvl, "==== Swap not possible Vol busy=%d swap=%d vol=%s from dev=%s to %s\n", 
+               vol->dev->is_busy(), vol->is_swapping(),
                VolumeName, vol->dev->print_name(), dev->print_name());
+            if (vol->is_swapping() && dev->swap_dev) {
+               Dmsg2(dbglvl, "Swap vol=%s dev=%s\n", vol->vol_name, dev->swap_dev->print_name());
+            } else {
+               Dmsg1(dbglvl, "swap_dev=%p\n", dev->swap_dev);
+            }
+            debug_list_volumes("failed swap");
             vol = NULL;                  /* device busy */
             goto get_out;
          }
@@ -526,6 +541,7 @@ static VOLRES *find_read_volume(const char *VolumeName)
    VOLRES vol, *fvol;
 
    if (read_vol_list->empty()) {
+      Dmsg0(dbglvl, "find_read_vol: read_vol_list empty.\n");
       return NULL;
    }
    /* Do not lock reservations here */
@@ -603,12 +619,14 @@ bool free_volume(DEVICE *dev)
    vol = dev->vol;
    /* Don't free a volume while it is being swapped */
    if (!vol->is_swapping()) {
-      Dmsg1(dbglvl, "=== clear in_use vol=%s\n", dev->vol->vol_name);
+      Dmsg1(dbglvl, "=== clear in_use vol=%s\n", vol->vol_name);
       dev->vol = NULL;
       vol_list->remove(vol);
       Dmsg2(dbglvl, "=== remove volume %s dev=%s\n", vol->vol_name, dev->print_name());
       free_vol_item(vol);
       debug_list_volumes("free_volume");
+   } else {
+      Dmsg1(dbglvl, "=== cannot clear swapping vol=%s\n", vol->vol_name);
    }
    unlock_volumes();
    return true;
@@ -697,6 +715,9 @@ bool DCR::can_i_use_volume()
    bool rtn = true;
    VOLRES *vol;
 
+   if (job_canceled(jcr)) {
+      return false;
+   }
    lock_volumes();
    vol = find_volume(VolumeName);
    if (!vol) {