Make sure to clear JS_WaitMedia when operator mounts a Volume.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@7098 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index e71d74c76b7993537fd0706c268fa39173de8ef4..c6b72b12506257e8ac5be74f00fee20ec4edcf34 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -493,7 +493,7 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr)
       }
       got_vol = dir_find_next_appendable_volume(dcr);   /* get suggested volume */
       if (got_vol) {
-         return true;
+         goto get_out;
       } else {
          if (stat == W_TIMEOUT || stat == W_MOUNT) {
             Mmsg(dev->errmsg, _(
@@ -539,6 +539,8 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr)
       }
       Dmsg1(100, "Someone woke me for device %s\n", dev->print_name());
    }
+
+get_out:
    set_jcr_job_status(jcr, JS_Running);
    dir_send_job_status(jcr);
    Dmsg0(100, "leave dir_ask_sysop_to_mount_create_appendable_volume\n");
@@ -618,7 +620,7 @@ bool dir_ask_sysop_to_mount_volume(DCR *dcr, int mode)
       if (dev->poll) {
          Dmsg1(400, "Poll timeout in mount vol on device %s\n", dev->print_name());
          Dmsg1(400, "Blocked=%s\n", dev->print_blocked());
-         goto bail_out;
+         goto get_out;
       }
 
       if (stat == W_TIMEOUT) {
@@ -641,7 +643,7 @@ bool dir_ask_sysop_to_mount_volume(DCR *dcr, int mode)
       break;
    }
 
-bail_out:
+get_out:
    set_jcr_job_status(jcr, JS_Running);
    dir_send_job_status(jcr);
    Dmsg0(400, "leave dir_ask_sysop_to_mount_volume\n");

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 269d829d890d9b8356235fccb7b45250ebd31298..895ee370434ac959753c9c518e9e16b4385f6f29 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,8 @@
               Technical notes on version 2.2
 
 General:
+03Jun08
+kes  Make sure to clear JS_WaitMedia when operator mounts a Volume.
 31May08
 kes  Add create_postgresql_database.sql to Win32 installer. Should 
      fix problem reported by Juilio Monteiro.