X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fjob.c;h=431071c582e0dc321414fabbad707ea26f9c5f97;hb=706490171cd2e5458defa3e4abfeca745d19d1f3;hp=404970bb2a8e2f1b59581f44c1086c869ef2dad0;hpb=49d212baa8f4e9f72a139465202f3d6cba53a90a;p=bacula%2Fbacula

diff --git a/bacula/src/stored/job.c b/bacula/src/stored/job.c
index 404970bb2a..431071c582 100644
--- a/bacula/src/stored/job.c
+++ b/bacula/src/stored/job.c
@@ -1,60 +1,64 @@
 /*
- *   Job control and execution for Storage Daemon
- *
- *   Kern Sibbald, MM
- *
- *   Version $Id$
- *
- */
-/*
-   Copyright (C) 2000-2005 Kern Sibbald
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
+   Bacula® is a registered trademark of Kern Sibbald.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ *   Job control and execution for Storage Daemon
+ *
+ *   Kern Sibbald, MM
+ *
+ *   Version $Id$
+ *
  */
 
 #include "bacula.h"
 #include "stored.h"
 
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
 /* Imported variables */
 extern uint32_t VolSessionTime;
 
 /* Imported functions */
 extern uint32_t newVolSessionId();
-
-/* Forward referenced functions */
-static bool use_storage_cmd(JCR *jcr);
+extern bool do_mac(JCR *jcr);
 
 /* Requests from the Director daemon */
 static char jobcmd[] = "JobId=%d job=%127s job_name=%127s client_name=%127s "
       "type=%d level=%d FileSet=%127s NoAttr=%d SpoolAttr=%d FileSetMD5=%127s "
-      "SpoolData=%d WritePartAfterJob=%d NewVol=%d\n";
-static char use_storage[]  = "use storage=%127s media_type=%127s "
-   "pool_name=%127s pool_type=%127s append=%d copy=%d stripe=%d\n";
-static char use_device[]  = "use device=%127s\n";
-//static char query_device[] = "query device=%127s";
+      "SpoolData=%d WritePartAfterJob=%d PreferMountedVols=%d SpoolSize=%s\n";
+static char oldjobcmd[] = "JobId=%d job=%127s job_name=%127s client_name=%127s "
+      "type=%d level=%d FileSet=%127s NoAttr=%d SpoolAttr=%d FileSetMD5=%127s "
+      "SpoolData=%d WritePartAfterJob=%d PreferMountedVols=%d\n";
+
 
 
 /* Responses sent to Director daemon */
 static char OKjob[]     = "3000 OK Job SDid=%u SDtime=%u Authorization=%s\n";
-static char OK_device[] = "3000 OK use device device=%s\n";
-static char NO_device[] = "3924 Device \"%s\" not in SD Device resources.\n";
-static char NOT_open[]  = "3925 Device \"%s\" could not be opened or does not exist.\n";
-static char BAD_use[]   = "3913 Bad use command: %s\n";
-static char BAD_job[]   = "3915 Bad Job command: %s\n";
+static char BAD_job[]   = "3915 Bad Job command. stat=%d CMD: %s\n";
 //static char OK_query[]  = "3001 OK query\n";
 //static char NO_query[]  = "3918 Query failed\n";
 //static char BAD_query[] = "3917 Bad query command: %s\n";
@@ -73,28 +77,39 @@ bool job_cmd(JCR *jcr)
 {
    int JobId;
    char auth_key[100];
+   char spool_size[30];
+   char seed[100];
    BSOCK *dir = jcr->dir_bsock;
    POOL_MEM job_name, client_name, job, fileset_name, fileset_md5;
    int JobType, level, spool_attributes, no_attributes, spool_data;
-   int write_part_after_job, NewVol;
-
+   int write_part_after_job, PreferMountedVols;
+   int stat;
    JCR *ojcr;
 
    /*
     * Get JobId and permissions from Director
     */
-   Dmsg1(100, "<dird: %s\n", dir->msg);
-   if (sscanf(dir->msg, jobcmd, &JobId, job.c_str(), job_name.c_str(),
+   Dmsg1(100, "<dird: %s", dir->msg);
+   bstrncpy(spool_size, "0", sizeof(spool_size));
+   stat = sscanf(dir->msg, jobcmd, &JobId, job.c_str(), job_name.c_str(),
               client_name.c_str(),
               &JobType, &level, fileset_name.c_str(), &no_attributes,
-              &spool_attributes, fileset_md5.c_str(), &spool_data, 
-              &write_part_after_job, &NewVol) != 13) {
-      pm_strcpy(jcr->errmsg, dir->msg);
-      bnet_fsend(dir, BAD_job, jcr->errmsg);
-      Dmsg1(100, ">dird: %s\n", dir->msg);
-      Emsg1(M_FATAL, 0, _("Bad Job Command from Director: %s\n"), jcr->errmsg);
-      set_jcr_job_status(jcr, JS_ErrorTerminated);
-      return false;
+              &spool_attributes, fileset_md5.c_str(), &spool_data,
+              &write_part_after_job, &PreferMountedVols, spool_size);
+   if (stat != 14) {
+      /* Try old version */
+      stat = sscanf(dir->msg, oldjobcmd, &JobId, job.c_str(), job_name.c_str(),
+              client_name.c_str(),
+              &JobType, &level, fileset_name.c_str(), &no_attributes,
+              &spool_attributes, fileset_md5.c_str(), &spool_data,
+              &write_part_after_job, &PreferMountedVols);
+      if (stat != 13) {
+         pm_strcpy(jcr->errmsg, dir->msg);
+         dir->fsend(BAD_job, stat, jcr->errmsg);
+         Dmsg1(100, ">dird: %s", dir->msg);
+         set_jcr_job_status(jcr, JS_ErrorTerminated);
+         return false;
+      }
    }
    /*
     * Since this job could be rescheduled, we
@@ -119,39 +134,30 @@ bool job_cmd(JCR *jcr)
    unbash_spaces(fileset_name);
    jcr->fileset_name = get_pool_memory(PM_NAME);
    pm_strcpy(jcr->fileset_name, fileset_name);
-   jcr->JobType = JobType;
-   jcr->JobLevel = level;
+   jcr->set_JobType(JobType);
+   jcr->set_JobLevel(level);
    jcr->no_attributes = no_attributes;
    jcr->spool_attributes = spool_attributes;
    jcr->spool_data = spool_data;
+   jcr->spool_size = str_to_int64(spool_size);
    jcr->write_part_after_job = write_part_after_job;
    jcr->fileset_md5 = get_pool_memory(PM_NAME);
    pm_strcpy(jcr->fileset_md5, fileset_md5);
-   jcr->NewVolEachJob = NewVol;
+   jcr->PreferMountedVols = PreferMountedVols;
 
    jcr->authenticated = false;
+   jcr->need_fd = true;
 
    /*
     * Pass back an authorization key for the File daemon
     */
-   make_session_key(auth_key, NULL, 1);
-   bnet_fsend(dir, OKjob, jcr->VolSessionId, jcr->VolSessionTime, auth_key);
-   Dmsg1(100, ">dird: %s", dir->msg);
+   bsnprintf(seed, sizeof(seed), "%p%d", jcr, JobId);
+   make_session_key(auth_key, seed, 1);
+   dir->fsend(OKjob, jcr->VolSessionId, jcr->VolSessionTime, auth_key);
+   Dmsg2(100, ">dird jid=%u: %s", (uint32_t)jcr->JobId, dir->msg);
    jcr->sd_auth_key = bstrdup(auth_key);
    memset(auth_key, 0, sizeof(auth_key));
-   return true;
-}
-
-bool use_cmd(JCR *jcr) 
-{
-   /*
-    * Wait for the device, media, and pool information
-    */
-   if (!use_storage_cmd(jcr)) {
-      set_jcr_job_status(jcr, JS_ErrorTerminated);
-      memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
-      return false;
-   }
+   generate_daemon_event(jcr, "JobStart");
    return true;
 }
 
@@ -160,16 +166,16 @@ bool run_cmd(JCR *jcr)
    struct timeval tv;
    struct timezone tz;
    struct timespec timeout;
-   int errstat;
-
-   Dmsg1(100, "Run_cmd: %s\n", jcr->dir_bsock->msg);
-   /* The following jobs don't need the FD */
-   switch (jcr->JobType) {
-   case JT_MIGRATION:
-   case JT_COPY:
-   case JT_ARCHIVE:
-      jcr->authenticated = true;
-      run_job(jcr);
+   int errstat = 0;
+
+   Dsm_check(1);
+   Dmsg1(200, "Run_cmd: %s\n", jcr->dir_bsock->msg);
+
+   /* If we do not need the FD, we are doing a migrate, copy, or virtual
+    *   backup.
+    */
+   if (!jcr->need_fd) {
+      do_mac(jcr);
       return false;
    }
 
@@ -178,22 +184,26 @@ bool run_cmd(JCR *jcr)
 
    gettimeofday(&tv, &tz);
    timeout.tv_nsec = tv.tv_usec * 1000;
-   timeout.tv_sec = tv.tv_sec + 30 * 60;        /* wait 30 minutes */
+   timeout.tv_sec = tv.tv_sec + me->client_wait;
+
+   Dmsg3(050, "%s waiting %d sec for FD to contact SD key=%s\n",
+         jcr->Job, (int)(timeout.tv_sec-time(NULL)), jcr->sd_auth_key);
 
-   Dmsg1(100, "%s waiting on FD to contact SD\n", jcr->Job);
    /*
     * Wait for the File daemon to contact us to start the Job,
     *  when he does, we will be released, unless the 30 minutes
     *  expires.
     */
-   P(jcr->mutex);
-   for ( ;!job_canceled(jcr); ) {
-      errstat = pthread_cond_timedwait(&jcr->job_start_wait, &jcr->mutex, &timeout);
-      if (errstat == 0 || errstat == ETIMEDOUT) {
+   P(mutex);
+   while ( !jcr->authenticated && !job_canceled(jcr) ) {
+      errstat = pthread_cond_timedwait(&jcr->job_start_wait, &mutex, &timeout);
+      if (errstat == ETIMEDOUT || errstat == EINVAL || errstat == EPERM) {
          break;
       }
    }
-   V(jcr->mutex);
+   Dmsg3(100, "Auth=%d canceled=%d errstat=%d\n", jcr->authenticated,
+      job_canceled(jcr), errstat);
+   V(mutex);
 
    memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
 
@@ -205,28 +215,32 @@ bool run_cmd(JCR *jcr)
 }
 
 /*
- * After receiving a connection (in job.c) if it is
+ * After receiving a connection (in dircmd.c) if it is
  *   from the File daemon, this routine is called.
  */
 void handle_filed_connection(BSOCK *fd, char *job_name)
 {
    JCR *jcr;
 
-   bmicrosleep(0, 50000);             /* wait 50 millisecs */
+/*
+ * With the following bmicrosleep on, running the 
+ * SD under the debugger fails.   
+ */ 
+// bmicrosleep(0, 50000);             /* wait 50 millisecs */
    if (!(jcr=get_jcr_by_full_name(job_name))) {
-      Jmsg1(NULL, M_FATAL, 0, _("Job name not found: %s\n"), job_name);
-      Dmsg1(100, "Job name not found: %s\n", job_name);
+      Jmsg1(NULL, M_FATAL, 0, _("FD connect failed: Job name not found: %s\n"), job_name);
+      Dmsg1(3, "**** Job \"%s\" not found.\n", job_name);
       return;
    }
 
    jcr->file_bsock = fd;
-   jcr->file_bsock->jcr = jcr;
+   jcr->file_bsock->set_jcr(jcr);
 
    Dmsg1(110, "Found Job %s\n", job_name);
 
    if (jcr->authenticated) {
-      Jmsg2(jcr, M_FATAL, 0, "Hey!!!! JobId %u Job %s already authenticated.\n",
-         jcr->JobId, jcr->Job);
+      Jmsg2(jcr, M_FATAL, 0, _("Hey!!!! JobId %u Job %s already authenticated.\n"),
+         (uint32_t)jcr->JobId, jcr->Job);
       free_jcr(jcr);
       return;
    }
@@ -239,210 +253,18 @@ void handle_filed_connection(BSOCK *fd, char *job_name)
       Jmsg(jcr, M_FATAL, 0, _("Unable to authenticate File daemon\n"));
    } else {
       jcr->authenticated = true;
-      Dmsg1(110, "OK Authentication Job %s\n", jcr->Job);
+      Dmsg2(110, "OK Authentication jid=%u Job %s\n", (uint32_t)jcr->JobId, jcr->Job);
    }
 
-   P(jcr->mutex);
    if (!jcr->authenticated) {
       set_jcr_job_status(jcr, JS_ErrorTerminated);
    }
    pthread_cond_signal(&jcr->job_start_wait); /* wake waiting job */
-   V(jcr->mutex);
    free_jcr(jcr);
    return;
 }
 
 
-/*
- *   Use Device command from Director
- *   He tells is what Device Name to use, the Media Type,
- *      the Pool Name, and the Pool Type.
- *
- *    Ensure that the device exists and is opened, then store
- *      the media and pool info in the JCR.
- */
-class DIRSTORE {
-public:
-   alist *device;
-   char name[MAX_NAME_LENGTH];
-   char media_type[MAX_NAME_LENGTH];
-   char pool_name[MAX_NAME_LENGTH];
-   char pool_type[MAX_NAME_LENGTH];
-};
-
-class DIRDEVICE {
-   alist *device;
-};
-   
-static bool use_storage_cmd(JCR *jcr)
-{
-   POOL_MEM store_name, dev_name, media_type, pool_name, pool_type;
-   BSOCK *dir = jcr->dir_bsock;
-   DEVRES *device;
-   AUTOCHANGER *changer;
-   int append;
-   bool ok;
-   int Copy, Stripe;
-
-   /*
-    * If there are multiple devices, the director sends us
-    *   use_device for each device that it wants to use.
-    */
-   Dmsg1(100, "<dird: %s", dir->msg);
-   ok = sscanf(dir->msg, use_storage, store_name.c_str(), 
-               media_type.c_str(), pool_name.c_str(), 
-               pool_type.c_str(), &append, &Copy, &Stripe) == 7;
-   if (ok) {
-      unbash_spaces(store_name);
-      unbash_spaces(media_type);
-      unbash_spaces(pool_name);
-      unbash_spaces(pool_type);
-      if (bnet_recv(dir) <= 0) {
-         return false;   
-      }
-      ok = sscanf(dir->msg, use_device, dev_name.c_str()) == 1;
-      if (!ok) {
-         return false;
-      }
-      /* Eat to BNET_EOD -- end of Devices */
-      while (bnet_recv(dir) > 0) {
-      }
-      /* Eat to end of Devices */
-      while (bnet_recv(dir) > 0) {         
-      }
-      LockRes();
-      foreach_res(device, R_DEVICE) {
-         /* Find resource, and make sure we were able to open it */
-         if (fnmatch(dev_name.c_str(), device->hdr.name, 0) == 0 &&
-             strcmp(device->media_type, media_type.c_str()) == 0) {
-            const int name_len = MAX_NAME_LENGTH;
-            DCR *dcr;
-            UnlockRes();
-            if (!device->dev) {
-               device->dev = init_dev(jcr, NULL, device);
-            }
-            if (!device->dev) {
-               Jmsg(jcr, M_WARNING, 0, _("\n"
-                  "     Device \"%s\" requested by DIR could not be opened or does not exist.\n"),
-                    dev_name.c_str());
-               bnet_fsend(dir, NOT_open, dev_name.c_str());
-               Dmsg1(100, ">dird: %s\n", dir->msg);
-               return false;
-            }  
-            dcr = new_dcr(jcr, device->dev);
-            if (!dcr) {
-               bnet_fsend(dir, _("3926 Could not get dcr for device: %s\n"), dev_name.c_str());
-               Dmsg1(100, ">dird: %s\n", dir->msg);
-               return false;
-            }
-            Dmsg1(100, "Found device %s\n", device->hdr.name);
-            bstrncpy(dcr->pool_name, pool_name, name_len);
-            bstrncpy(dcr->pool_type, pool_type, name_len);
-            bstrncpy(dcr->media_type, media_type, name_len);
-            bstrncpy(dcr->dev_name, dev_name, name_len);
-            dcr->Copy = Copy;
-            dcr->Stripe = Stripe;
-            jcr->dcr = dcr;
-            if (append == SD_APPEND) {
-               ok = reserve_device_for_append(dcr);
-            } else {
-               ok = reserve_device_for_read(dcr);
-            }
-            if (!ok) {
-               bnet_fsend(dir, _("3927 Could not reserve device: %s\n"), dev_name.c_str());
-               Dmsg1(100, ">dird: %s\n", dir->msg);
-               free_dcr(jcr->dcr);
-               return false;
-            }
-            Dmsg1(220, "Got: %s", dir->msg);
-            bash_spaces(dev_name);
-            ok = bnet_fsend(dir, OK_device, dev_name.c_str());
-            Dmsg1(100, ">dird: %s\n", dir->msg);
-            return ok;
-         }
-      }
-
-      foreach_res(changer, R_AUTOCHANGER) {
-         /* Find resource, and make sure we were able to open it */
-         if (fnmatch(dev_name.c_str(), changer->hdr.name, 0) == 0) {
-            const int name_len = MAX_NAME_LENGTH;
-            DCR *dcr;
-            /* Try each device in this AutoChanger */
-            foreach_alist(device, changer->device) {
-               Dmsg1(100, "Try changer device %s\n", device->hdr.name);
-               if (!device->dev) {
-                  device->dev = init_dev(jcr, NULL, device);
-               }
-               if (!device->dev) {
-                  Dmsg1(100, "Device %s could not be opened. Skipped\n", dev_name.c_str());
-                  Jmsg(jcr, M_WARNING, 0, _("\n"
-                     "     Device \"%s\" in changer \"%s\" requested by DIR could not be opened or does not exist.\n"),
-                       device->hdr.name, dev_name.c_str());
-                  continue;
-               }
-               if (!device->dev->autoselect) {
-                  continue;           /* device is not available */
-               }
-               dcr = new_dcr(jcr, device->dev);
-               if (!dcr) {
-                  bnet_fsend(dir, _("3926 Could not get dcr for device: %s\n"), dev_name.c_str());
-                  Dmsg1(100, ">dird: %s\n", dir->msg);
-                  UnlockRes();
-                  return false;
-               }
-               Dmsg1(100, "Found changer device %s\n", device->hdr.name);
-               bstrncpy(dcr->pool_name, pool_name, name_len);
-               bstrncpy(dcr->pool_type, pool_type, name_len);
-               bstrncpy(dcr->media_type, media_type, name_len);
-               bstrncpy(dcr->dev_name, dev_name, name_len);
-               jcr->dcr = dcr;
-               if (append == SD_APPEND) {
-                  ok = reserve_device_for_append(dcr);
-               } else {
-                  ok = reserve_device_for_read(dcr);
-               }
-               if (!ok) {
-                  Jmsg(jcr, M_WARNING, 0, _("Could not reserve device: %s\n"), dev_name.c_str());
-                  free_dcr(jcr->dcr);
-                  continue;
-               }
-               Dmsg1(100, "Device %s opened.\n", dev_name.c_str());
-               UnlockRes();
-               pm_strcpy(dev_name, device->hdr.name);
-               bash_spaces(dev_name);
-               ok = bnet_fsend(dir, OK_device, dev_name.c_str());
-               Dmsg1(100, ">dird: %s\n", dir->msg);
-               return ok;
-            }
-            break;                    /* we found it but could not open a device */
-         }
-      }
-
-      UnlockRes();
-      if (verbose) {
-         unbash_spaces(dir->msg);
-         pm_strcpy(jcr->errmsg, dir->msg);
-         Jmsg(jcr, M_INFO, 0, _("Failed command: %s\n"), jcr->errmsg);
-      }
-      Jmsg(jcr, M_FATAL, 0, _("\n"
-         "     Device \"%s\" with MediaType \"%s\" requested by DIR not found in SD Device resources.\n"),
-           dev_name.c_str(), media_type.c_str());
-      bnet_fsend(dir, NO_device, dev_name.c_str());
-      Dmsg1(100, ">dird: %s\n", dir->msg);
-   } else {
-      unbash_spaces(dir->msg);
-      pm_strcpy(jcr->errmsg, dir->msg);
-      if (verbose) {
-         Jmsg(jcr, M_INFO, 0, _("Failed command: %s\n"), jcr->errmsg);
-      }
-      Jmsg(jcr, M_FATAL, 0, _("Bad Use Device command: %s\n"), jcr->errmsg);
-      bnet_fsend(dir, BAD_use, jcr->errmsg);
-      Dmsg1(100, ">dird: %s\n", dir->msg);
-   }
-
-   return false;                      /* ERROR return */
-}
-
 #ifdef needed
 /*
  *   Query Device command from Director
@@ -465,52 +287,48 @@ bool query_cmd(JCR *jcr)
    Dmsg1(100, "<dird: %s\n", dir->msg);
    if (ok) {
       unbash_spaces(dev_name);
-      LockRes();
       foreach_res(device, R_DEVICE) {
          /* Find resource, and make sure we were able to open it */
-         if (fnmatch(dev_name.c_str(), device->hdr.name, 0) == 0) {
+         if (strcmp(dev_name.c_str(), device->hdr.name) == 0) {
             if (!device->dev) {
-               device->dev = init_dev(jcr, NULL, device);
+               device->dev = init_dev(jcr, device);
             }
             if (!device->dev) {
                break;
             }  
-            UnlockRes();
             ok = dir_update_device(jcr, device->dev);
             if (ok) {
-               ok = bnet_fsend(dir, OK_query);
+               ok = dir->fsend(OK_query);
             } else {
-               bnet_fsend(dir, NO_query);
+               dir->fsend(NO_query);
             }
             return ok;
          }
       }
       foreach_res(changer, R_AUTOCHANGER) {
          /* Find resource, and make sure we were able to open it */
-         if (fnmatch(dev_name.c_str(), changer->hdr.name, 0) == 0) {
-            UnlockRes();
+         if (strcmp(dev_name.c_str(), changer->hdr.name) == 0) {
             if (!changer->device || changer->device->size() == 0) {
                continue;              /* no devices */
             }
             ok = dir_update_changer(jcr, changer);
             if (ok) {
-               ok = bnet_fsend(dir, OK_query);
+               ok = dir->fsend(OK_query);
             } else {
-               bnet_fsend(dir, NO_query);
+               dir->fsend(NO_query);
             }
             return ok;
          }
       }
       /* If we get here, the device/autochanger was not found */
-      UnlockRes();
       unbash_spaces(dir->msg);
       pm_strcpy(jcr->errmsg, dir->msg);
-      bnet_fsend(dir, NO_device, dev_name.c_str());
+      dir->fsend(NO_device, dev_name.c_str());
       Dmsg1(100, ">dird: %s\n", dir->msg);
    } else {
       unbash_spaces(dir->msg);
       pm_strcpy(jcr->errmsg, dir->msg);
-      bnet_fsend(dir, BAD_query, jcr->errmsg);
+      dir->fsend(BAD_query, jcr->errmsg);
       Dmsg1(100, ">dird: %s\n", dir->msg);
    }
 
@@ -526,8 +344,9 @@ bool query_cmd(JCR *jcr)
  */
 void stored_free_jcr(JCR *jcr)
 {
+   Dmsg1(900, "stored_free_jcr JobId=%u\n", jcr->JobId);
    if (jcr->file_bsock) {
-      bnet_close(jcr->file_bsock);
+      jcr->file_bsock->close();
       jcr->file_bsock = NULL;
    }
    if (jcr->job_name) {
@@ -560,9 +379,42 @@ void stored_free_jcr(JCR *jcr)
       delete jcr->dcrs;
    }
    jcr->dcrs = NULL;
+
+   /* Avoid a double free */
+   if (jcr->dcr == jcr->read_dcr) {
+      jcr->read_dcr = NULL;
+   }
    if (jcr->dcr) {
       free_dcr(jcr->dcr);
       jcr->dcr = NULL;
    }
+   if (jcr->read_dcr) {
+      free_dcr(jcr->read_dcr);
+      jcr->read_dcr = NULL;
+   }
+
+   if (jcr->read_store) {
+      DIRSTORE *store;
+      foreach_alist(store, jcr->read_store) {
+         delete store->device;
+         delete store;
+      }
+      delete jcr->read_store;
+      jcr->read_store = NULL;
+   }
+   if (jcr->write_store) {
+      DIRSTORE *store;
+      foreach_alist(store, jcr->write_store) {
+         delete store->device;
+         delete store;
+      }
+      delete jcr->write_store;
+      jcr->write_store = NULL;
+   }
+   Dsm_check(1);
+
+   if (jcr->JobId != 0)
+      write_state_file(me->working_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
+
    return;
 }