Make sure to clear JS_WaitMedia when operator mounts a Volume.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7099 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index 39c5f460887b209920c2f4b74d2114483df86f28..47250e7cbbd7a1c14644456602c3b5c71d5f1329 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) {
       }
       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, _(
       } 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());
    }
       }
       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");
    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());
       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) {
       }
 
       if (stat == W_TIMEOUT) {


@@ -641,7 +643,7 @@ bool dir_ask_sysop_to_mount_volume(DCR *dcr, int mode)
       break;
    }
 
       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");
    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.3 b/bacula/technotes-2.3
index f74621a780984585b9af2506f1e718a8ada2b270..8f175cf0ff62323d042364bfeeabd0003e810fea 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -24,6 +24,8 @@ Add long term statistics job table
 
 
 General:
 
 
 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.
 31May08
 kes  Add create_postgresql_database.sql to Win32 installer. Should 
      fix problem reported by Juilio Monteiro.