- Merge changes made to 1.38.3 into HEAD

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

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index d67880dfe5f8718769edc89047aad8d11472c21a..09e05e98e9d59b07a1fa5bae2386a21ae148f62d 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -242,12 +242,12 @@ bool dir_find_next_appendable_volume(DCR *dcr)
        Dmsg1(100, ">dird: %s", dir->msg);
        bool OK = do_get_volume_info(dcr);
        if (OK) {
-          if (is_volume_in_use(dcr)) {
-             Dmsg1(100, "Volume %s is in use.\n", dcr->VolumeName);
-             continue;
-          } else {
+          if (dcr->any_volume || !is_volume_in_use(dcr)) {
              found = true;
              break;
+          } else {
+             Dmsg1(100, "Volume %s is in use.\n", dcr->VolumeName);
+             continue;
           }
        } else {
           Dmsg0(200, "No volume info, return false\n");
@@ -282,16 +282,16 @@ bool dir_update_volume_info(DCR *dcr, bool label)
 
    if (vol->VolCatName[0] == 0) {
       Jmsg0(jcr, M_FATAL, 0, _("NULL Volume name. This shouldn't happen!!!\n"));
-      Pmsg0(000, "NULL Volume name. This shouldn't happen!!!\n");
+      Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
       return false;
    }
    if (dev->can_read()) {
       Jmsg0(jcr, M_FATAL, 0, _("Attempt to update_volume_info in read mode!!!\n"));
-      Pmsg0(000, "Attempt to update_volume_info in read mode!!!\n");
+      Pmsg0(000, _("Attempt to update_volume_info in read mode!!!\n"));
       return false;
    }
 
-   Dmsg1(300, "Update cat VolFiles=%d\n", dev->file);
+   Dmsg1(100, "Update cat VolFiles=%d\n", dev->file);
    /* Just labeled or relabeled the tape */
    if (label) {
       bstrncpy(vol->VolCatStatus, "Append", sizeof(vol->VolCatStatus));
@@ -315,7 +315,7 @@ bool dir_update_volume_info(DCR *dcr, bool label)
    /* Do not lock device here because it may be locked from label */
    if (!do_get_volume_info(dcr)) {
       Jmsg(jcr, M_FATAL, 0, "%s", jcr->errmsg);
-      Pmsg2(000, "Didn't get vol info vol=%s: ERR=%s", 
+      Pmsg2(000, _("Didn't get vol info vol=%s: ERR=%s"), 
          vol->VolCatName, jcr->errmsg);
       return false;
    }
@@ -477,7 +477,7 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr)
 
       stat = wait_for_sysop(dcr);
       if (dev->poll) {
-         Dmsg1(400, "Poll timeout in create append vol on device %s\n", dev->print_name());
+         Dmsg1(100, "Poll timeout in create append vol on device %s\n", dev->print_name());
          continue;
       }
 
@@ -486,7 +486,7 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr)
             Mmsg(dev->errmsg, _("Max time exceeded waiting to mount Storage Device %s for Job %s\n"),
                dev->print_name(), jcr->Job);
             Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg);
-            Dmsg1(400, "Gave up waiting on device %s\n", dev->print_name());
+            Dmsg1(100, "Gave up waiting on device %s\n", dev->print_name());
             return false;             /* exceeded maximum waits */
          }
          continue;
@@ -503,7 +503,7 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr)
          Jmsg(jcr, M_WARNING, 0, _("pthread error in mount_next_volume stat=%d ERR=%s\n"), stat,
             be.strerror(stat));
       }
-      Dmsg1(400, "Someone woke me for device %s\n", dev->print_name());
+      Dmsg1(100, "Someone woke me for device %s\n", dev->print_name());
 
       /* If no VolumeName, and cannot get one, try again */
       P(dev->mutex);
@@ -531,7 +531,7 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr)
    }
    set_jcr_job_status(jcr, JS_Running);
    dir_send_job_status(jcr);
-   Dmsg0(400, "leave dir_ask_sysop_to_mount_create_appendable_volume\n");
+   Dmsg0(100, "leave dir_ask_sysop_to_mount_create_appendable_volume\n");
    return true;
 }
 
@@ -550,7 +550,6 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr)
 bool dir_ask_sysop_to_mount_volume(DCR *dcr)
 {
    int stat = 0;
-   const char *msg;
    DEVICE *dev = dcr->dev;
    JCR *jcr = dcr->jcr;
 
@@ -567,10 +566,12 @@ bool dir_ask_sysop_to_mount_volume(DCR *dcr)
          return false;
       }
 
+      if (dev->is_dvd()) {   
+         unmount_dev(dev, 0);
+      }
       if (!dev->poll) {
-         msg = _("Please mount");
-         Jmsg(jcr, M_MOUNT, 0, _("%s Volume \"%s\" on Storage Device %s for Job %s\n"),
-              msg, dcr->VolumeName, dev->print_name(), jcr->Job);
+         Jmsg(jcr, M_MOUNT, 0, _("Please mount Volume \"%s\" on Storage Device %s for Job %s\n"),
+              dcr->VolumeName, dev->print_name(), jcr->Job);
          Dmsg3(400, "Mount \"%s\" on device \"%s\" for Job %s\n",
                dcr->VolumeName, dev->print_name(), jcr->Job);
       }