From: Martin Simmons <martin@lispworks.com>
Date: Fri, 24 May 2019 13:54:44 +0000 (+0200)
Subject: Fix bug 2476 -- copy/migration jobs fail when waiting for a new Volume
X-Git-Tag: Release-9.4.4~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d021f3209859246f2ba70cbf570d3f9aac4936d;p=thirdparty%2Fbacula.git

Fix bug 2476 -- copy/migration jobs fail when waiting for a new Volume
---

diff --git a/bacula/src/stored/wait.c b/bacula/src/stored/wait.c
index 300759549..d3cd58e3e 100644
--- a/bacula/src/stored/wait.c
+++ b/bacula/src/stored/wait.c
@@ -106,8 +106,12 @@ int wait_for_sysop(DCR *dcr)
       /* Note, this always triggers the first time. We want that. */
       if (me->heartbeat_interval) {
          if (now - last_heartbeat >= me->heartbeat_interval) {
-            /* send heartbeats */
-            if (jcr->file_bsock) {
+            /* Send Heartbeats
+               Note when sd_client is set, the SD is acting as an FD,
+                bug the SD has code to receive heartbeats, so we skip
+                sending them.
+            */
+            if (jcr->file_bsock && !(jcr->is_JobType(JT_BACKUP) && jcr->sd_client)) {
                jcr->file_bsock->signal(BNET_HEARTBEAT);
                Dmsg0(dbglvl, "Send heartbeat to FD.\n");
             }