From: Eric Bollengier <eric@baculasystems.com>
Date: Thu, 12 Nov 2015 08:33:39 +0000 (+0100)
Subject: Fix #1414 When the FD is down, status dir now prints "is waiting for Client xx-fd"
X-Git-Tag: Release-7.4.0~177
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=57c221ba366c16af4b45636e8b7db335e0a05ddd;p=bacula%2Fbacula

Fix #1414 When the FD is down, status dir now prints "is waiting for Client xx-fd"
---

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 6ac3d66ed2..4256c70dfa 100644
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -1002,17 +1002,21 @@ static void list_running_jobs(UAContext *ua)
          msg = _("is waiting for an appendable Volume");
          break;
       case JS_WaitFD:
-         if (!pool_mem) {
-            emsg = (char *)get_pool_memory(PM_FNAME);
-            pool_mem = true;
+         /* Special case when JobStatus=JS_WaitFD, we don't have a FD link yet 
+          * we need to stay in WaitFD status See bee mantis #1414 */
+         if (jcr->JobStatus != JS_WaitFD) {
+            if (!pool_mem) {
+               emsg = (char *)get_pool_memory(PM_FNAME);
+               pool_mem = true;
+            }
+            if (!jcr->client || !jcr->wstore) {
+               Mmsg(emsg, _("is waiting for Client to connect to Storage daemon"));
+            } else {
+               Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),
+                    jcr->client->name(), jcr->wstore->name());
+            }
+            msg = emsg;
          }
-         if (!jcr->client || !jcr->wstore) {
-            Mmsg(emsg, _("is waiting for Client to connect to Storage daemon"));
-         } else {
-            Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),
-                 jcr->client->name(), jcr->wstore->name());
-        }
-        msg = emsg;
         break;
       case JS_DataCommitting:
          msg = _("SD committing Data");