Revert "Close the FD network link when we do a hangup on the storage side"

This reverts commit 58bffb0260c76fb3077a077e1ea7b31eabc2cc5f.

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index c5b2a4e6ea5c3708080168d25c4ba93aa2b4f3c3..8b9976eb3917e489ca91698c48ce3d130dc0f5e5 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -819,7 +819,6 @@ bool process_and_send_data(bctx_t &bctx)
 
    /* Debug code: check if we must hangup or blowup */
    if (handle_hangup_blowup(jcr, 0, jcr->ReadBytes)) {
-      sd->close();
       goto err;
    }
 

diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index c82f37ae8e4d4bd99ba3d28089bd3e539a797909..261c642305494498fe0dcf629a266a5c28455613 100644 (file)
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -1040,7 +1040,6 @@ void do_restore(JCR *jcr)
 
       /* Debug code: check if we must hangup or blowup */
       if (handle_hangup_blowup(jcr, jcr->JobFiles, jcr->JobBytes)) {
-         sd->close();
          goto get_out;
       }
 

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index 3d5cefef1c083fc78f41825ca694bf82def8a45f..4f463b406f670872e56f884740fb8e41c62c9669 100644 (file)
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -235,7 +235,6 @@ fi_checked:
 
          /* Debug code: check if we must hangup or blowup */
          if (handle_hangup_blowup(jcr, jcr->JobFiles, jcr->JobBytes)) {
-            fd->close();
             return false;
          }
          Dmsg4(850, "before write_rec FI=%d SessId=%d Strm=%s len=%d\n",

diff --git a/bacula/src/stored/read.c b/bacula/src/stored/read.c
index d11b9913510ba7576789966315fa001923a9dd61..c60f5b34d33d4d67b51c8c6da859af99efa3f76b 100644 (file)
--- a/bacula/src/stored/read.c
+++ b/bacula/src/stored/read.c
@@ -219,7 +219,6 @@ static bool read_record_cb(DCR *dcr, DEV_RECORD *rec)
 
    /* Debug code: check if we must hangup or blowup */
    if (handle_hangup_blowup(jcr, jcr->JobFiles, jcr->JobBytes)) {
-      fd->close();
       return false;
    }