Fix bug #2271 where poll interval causes tape mount message to repeat

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

diff --git a/bacula/src/stored/wait.c b/bacula/src/stored/wait.c
index e74c7bcaf6bda5f778e913ef59f5d44f37dc5b1b..655e7570d9f79b02dc06c3a3164c4dda36e83f1d 100644 (file)
--- a/bacula/src/stored/wait.c
+++ b/bacula/src/stored/wait.c
@@ -1,17 +1,20 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2017 Kern Sibbald
 
-   The main author of Bacula is Kern Sibbald, with contributions from many
-   others, a complete list can be found in the file AUTHORS.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
    You may use this file and others of this release according to the
    license defined in the LICENSE file, which includes the Affero General
    Public License, v3.0 ("AGPLv3") and some additional permissions and
    terms pursuant to its AGPLv3 Section 7.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  *  Subroutines to handle waiting for operator intervention
@@ -143,7 +146,7 @@ int wait_for_sysop(DCR *dcr)
 
       if (!unmounted && dev->vol_poll_interval &&
           (total_waited >= dev->vol_poll_interval)) {
-         Dmsg1(dbglvl, "poll return in wait blocked=%s\n", dev->print_blocked());
+         Dmsg1(dbglvl, "Set poll=true return in wait blocked=%s\n", dev->print_blocked());
          dev->poll = true;            /* returning a poll event */
          stat = W_POLL;
          break;
@@ -193,7 +196,7 @@ int wait_for_sysop(DCR *dcr)
       dev->set_blocked(dev->dev_prev_blocked);    /* restore entry state */
       Dmsg1(dbglvl, "set %s\n", dev->print_blocked());
    }
-   Dmsg1(dbglvl, "Exit blocked=%s\n", dev->print_blocked());
+   Dmsg2(dbglvl, "Exit blocked=%s poll=%d\n", dev->print_blocked(), dev->poll);
    dev->Unlock();
    return stat;
 }