]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/stored/job.c
- Simplify code in askdir.c that waits for creating an appendable
[bacula/bacula] / bacula / src / stored / job.c
index 6bde98a8a702337ccf7e4fd65d5c52286ba111f4..1176ef45f8e64de2fddbb2b7493a94b215f46e0c 100644 (file)
    Copyright (C) 2000-2005 Kern Sibbald
 
    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.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -35,25 +30,14 @@ extern uint32_t VolSessionTime;
 /* Imported functions */
 extern uint32_t newVolSessionId();
 
-/* Forward referenced functions */
-static bool use_storage_cmd(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\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 OK_query[]  = "3001 OK query\n";
 //static char NO_query[]  = "3918 Query failed\n";
@@ -76,22 +60,22 @@ bool job_cmd(JCR *jcr)
    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;
 
    JCR *ojcr;
 
    /*
     * Get JobId and permissions from Director
     */
-   Dmsg1(100, "<dird: %s\n", dir->msg);
+   Dmsg1(100, "<dird: %s", dir->msg);
    if (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) {
+              &write_part_after_job, &PreferMountedVols) != 13) {
       pm_strcpy(jcr->errmsg, dir->msg);
       bnet_fsend(dir, BAD_job, jcr->errmsg);
-      Dmsg1(100, ">dird: %s\n", dir->msg);
+      Dmsg1(100, ">dird: %s", dir->msg);
       Emsg1(M_FATAL, 0, _("Bad Job Command from Director: %s\n"), jcr->errmsg);
       set_jcr_job_status(jcr, JS_ErrorTerminated);
       return false;
@@ -127,7 +111,7 @@ bool job_cmd(JCR *jcr)
    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;
 
@@ -143,19 +127,6 @@ bool job_cmd(JCR *jcr)
    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;
-   }
-   return true;
-}
-
 bool run_cmd(JCR *jcr)
 {
    struct timeval tv;
@@ -163,10 +134,10 @@ bool run_cmd(JCR *jcr)
    struct timespec timeout;
    int errstat;
 
-   Dmsg1(100, "Run_cmd: %s\n", jcr->dir_bsock->msg);
+   Dmsg1(200, "Run_cmd: %s\n", jcr->dir_bsock->msg);
    /* The following jobs don't need the FD */
    switch (jcr->JobType) {
-   case JT_MIGRATION:
+   case JT_MIGRATE:
    case JT_COPY:
    case JT_ARCHIVE:
       jcr->authenticated = true;
@@ -226,7 +197,7 @@ void handle_filed_connection(BSOCK *fd, char *job_name)
    Dmsg1(110, "Found Job %s\n", job_name);
 
    if (jcr->authenticated) {
-      Jmsg2(jcr, M_FATAL, 0, "Hey!!!! JobId %u Job %s already authenticated.\n",
+      Jmsg2(jcr, M_FATAL, 0, _("Hey!!!! JobId %u Job %s already authenticated.\n"),
          jcr->JobId, jcr->Job);
       free_jcr(jcr);
       return;
@@ -254,230 +225,6 @@ void handle_filed_connection(BSOCK *fd, char *job_name)
 }
 
 
-/*
- *   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];
-};
-
-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;
-   alist *dirstore;   
-   DIRSTORE *store;
-   char *device_name;
-
-   /*
-    * 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);
-   dirstore = New(alist(10, not_owned_by_alist));
-   do {
-      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) {
-         break;
-      }
-      unbash_spaces(store_name);
-      unbash_spaces(media_type);
-      unbash_spaces(pool_name);
-      unbash_spaces(pool_type);
-      store = new DIRSTORE;
-      dirstore->append(store);
-      memset(store, 0, sizeof(DIRSTORE));
-      store->device = New(alist(10));
-      bstrncpy(store->name, store_name, sizeof(store->name));
-      bstrncpy(store->media_type, media_type, sizeof(store->media_type));
-      bstrncpy(store->pool_name, pool_name, sizeof(store->pool_name));
-      bstrncpy(store->pool_type, pool_type, sizeof(store->pool_type));
-
-      /* Now get all devices */
-      while (bnet_recv(dir) >= 0) {
-         ok = sscanf(dir->msg, use_device, dev_name.c_str()) == 1;
-         if (!ok) {
-            break;
-         }
-         unbash_spaces(dev_name);
-         store->device->append(bstrdup(dev_name.c_str()));
-      }
-   }  while (ok && bnet_recv(dir) >= 0);
-
-   /* This loop is debug code and can be removed */
-   /*  ***FIXME*** turn off in production */
-   foreach_alist(store, dirstore) {
-      Dmsg4(100, "Storage=%s media_type=%s pool=%s pool_type=%s\n", 
-         store->name, store->media_type, store->pool_name, 
-         store->pool_type);
-      foreach_alist(device_name, store->device) {
-         Dmsg1(100, "   Device=%s\n", device_name);
-      }
-   }
-
-
-   if (ok) {
-      LockRes();
-      store = (DIRSTORE *)dirstore->first();
-      foreach_alist(device_name, store->device) {
-         foreach_res(device, R_DEVICE) {
-            /* Find resource, and make sure we were able to open it */
-            if (fnmatch(device_name, device->hdr.name, 0) == 0 &&
-                strcmp(device->media_type, store->media_type) == 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, store->pool_name, name_len);
-               bstrncpy(dcr->pool_type, store->pool_type, name_len);
-               bstrncpy(dcr->media_type, store->media_type, name_len);
-               bstrncpy(dcr->dev_name, device_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);
-                  goto get_out; 
-               }
-               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);
-               goto get_out;
-            }
-         }
-         foreach_res(changer, R_AUTOCHANGER) {
-            /* Find resource, and make sure we were able to open it */
-            if (fnmatch(device_name, 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();
-                     ok = false;
-                     goto get_out;
-                  }
-                  Dmsg1(100, "Found changer device %s\n", device->hdr.name);
-                  bstrncpy(dcr->pool_name, store->pool_name, name_len);
-                  bstrncpy(dcr->pool_type, store->pool_type, name_len);
-                  bstrncpy(dcr->media_type, store->media_type, name_len);
-                  bstrncpy(dcr->dev_name, device_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", device_name);
-                  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);
-                  goto get_out;
-               }
-               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);
-      ok = false;
-   } 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);
-      ok = false;
-   }
-
-get_out:
-   foreach_alist(store, dirstore) {
-      delete store->device;
-      delete store;
-   }
-   delete dirstore;
-   return ok;
-}
-
 #ifdef needed
 /*
  *   Query Device command from Director
@@ -500,17 +247,17 @@ bool query_cmd(JCR *jcr)
    Dmsg1(100, "<dird: %s\n", dir->msg);
    if (ok) {
       unbash_spaces(dev_name);
-      LockRes();
+//    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 (!device->dev) {
-               device->dev = init_dev(jcr, NULL, device);
+               device->dev = init_dev(jcr, device);
             }
             if (!device->dev) {
                break;
             }  
-            UnlockRes();
+//          UnlockRes();
             ok = dir_update_device(jcr, device->dev);
             if (ok) {
                ok = bnet_fsend(dir, OK_query);
@@ -523,7 +270,7 @@ bool query_cmd(JCR *jcr)
       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();
+//          UnlockRes();
             if (!changer->device || changer->device->size() == 0) {
                continue;              /* no devices */
             }
@@ -537,7 +284,7 @@ bool query_cmd(JCR *jcr)
          }
       }
       /* If we get here, the device/autochanger was not found */
-      UnlockRes();
+//    UnlockRes();
       unbash_spaces(dir->msg);
       pm_strcpy(jcr->errmsg, dir->msg);
       bnet_fsend(dir, NO_device, dev_name.c_str());
@@ -599,5 +346,9 @@ void stored_free_jcr(JCR *jcr)
       free_dcr(jcr->dcr);
       jcr->dcr = NULL;
    }
+   if (jcr->read_dcr) {
+      free_dcr(jcr->read_dcr);
+      jcr->read_dcr = NULL;
+   }
    return;
 }