X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fjob.c;h=e34eb335ec6499d9924c27cf429a363a2c0ebd66;hb=00052444d8aacc1509d9dbd3cf6676267dc0a150;hp=bd0be764f82ba27438943b1363c4582f7c2642cf;hpb=137bb193b84b61ecd75ea4d5093ced7c190809be;p=bacula%2Fbacula

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index bd0be764f8..e34eb335ec 100644
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -1,14 +1,14 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
 
    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 plus additions
-   that are listed in the file LICENSE.
+   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
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   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.
@@ -41,8 +41,9 @@
 static void *job_thread(void *arg);
 static void job_monitor_watchdog(watchdog_t *self);
 static void job_monitor_destructor(watchdog_t *self);
-static bool job_check_maxwaittime(JCR *control_jcr, JCR *jcr);
-static bool job_check_maxruntime(JCR *control_jcr, JCR *jcr);
+static bool job_check_maxwaittime(JCR *jcr);
+static bool job_check_maxruntime(JCR *jcr);
+static bool job_check_maxschedruntime(JCR *jcr);
 
 /* Imported subroutines */
 extern void term_scheduler();
@@ -111,6 +112,7 @@ bool setup_job(JCR *jcr)
    if ((errstat = pthread_cond_init(&jcr->term_wait, NULL)) != 0) {
       berrno be;
       Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), be.bstrerror(errstat));
+      jcr->unlock();
       goto bail_out;
    }
    jcr->term_wait_inited = true;
@@ -123,10 +125,11 @@ bool setup_job(JCR *jcr)
     * Open database
     */
    Dmsg0(100, "Open database\n");
-   jcr->db=db_init_database(jcr, jcr->catalog->db_name, jcr->catalog->db_user,
-                            jcr->catalog->db_password, jcr->catalog->db_address,
-                            jcr->catalog->db_port, jcr->catalog->db_socket,
-                            jcr->catalog->mult_db_connections);
+   jcr->db=db_init(jcr, jcr->catalog->db_driver, jcr->catalog->db_name, 
+                   jcr->catalog->db_user,
+                   jcr->catalog->db_password, jcr->catalog->db_address,
+                   jcr->catalog->db_port, jcr->catalog->db_socket,
+                   jcr->catalog->mult_db_connections);
    if (!jcr->db || !db_open_database(jcr, jcr->db)) {
       Jmsg(jcr, M_FATAL, 0, _("Could not open database \"%s\".\n"),
                  jcr->catalog->db_name);
@@ -145,8 +148,8 @@ bool setup_job(JCR *jcr)
       jcr->pool_source = get_pool_memory(PM_MESSAGE);
       pm_strcpy(jcr->pool_source, _("unknown source"));
    }
-   Dmsg2(500, "pool=%s (From %s)\n", jcr->pool->name(), jcr->pool_source);
-   if (jcr->JobType == JT_MIGRATE) {
+
+   if (jcr->JobReads()) {
       if (!jcr->rpool_source) {
          jcr->rpool_source = get_pool_memory(PM_MESSAGE);
          pm_strcpy(jcr->rpool_source, _("unknown source"));
@@ -175,12 +178,23 @@ bool setup_job(JCR *jcr)
       goto bail_out;
    }
 
+   if (jcr->JobReads() && !jcr->rstorage) {
+      if (jcr->job->storage) {
+         copy_rwstorage(jcr, jcr->job->storage, _("Job resource"));
+      } else {
+         copy_rwstorage(jcr, jcr->job->pool->storage, _("Pool resource"));
+      }
+   }
+   if (!jcr->JobReads()) {
+      free_rstorage(jcr);
+   }
+
    /*
     * Now, do pre-run stuff, like setting job level (Inc/diff, ...)
     *  this allows us to setup a proper job start record for restarting
     *  in case of later errors.
     */
-   switch (jcr->JobType) {
+   switch (jcr->get_JobType()) {
    case JT_BACKUP:
       if (!do_backup_init(jcr)) {
          backup_cleanup(jcr, JS_ErrorTerminated);
@@ -201,18 +215,20 @@ bool setup_job(JCR *jcr)
          admin_cleanup(jcr, JS_ErrorTerminated);
       }
       break;
+   case JT_COPY:
    case JT_MIGRATE:
       if (!do_migration_init(jcr)) { 
          migration_cleanup(jcr, JS_ErrorTerminated);
       }
       break;
    default:
-      Pmsg1(0, _("Unimplemented job type: %d\n"), jcr->JobType);
+      Pmsg1(0, _("Unimplemented job type: %d\n"), jcr->get_JobType());
       set_jcr_job_status(jcr, JS_ErrorTerminated);
       break;
    }
 
    generate_job_event(jcr, "JobInit");
+   Dsm_check(1);
    return true;
 
 bail_out:
@@ -236,9 +252,8 @@ static void *job_thread(void *arg)
 {
    JCR *jcr = (JCR *)arg;
 
-   jcr->my_thread_id = pthread_self();
-   pthread_detach(jcr->my_thread_id);
-   sm_check(__FILE__, __LINE__, true);
+   pthread_detach(pthread_self());
+   Dsm_check(1);
 
    Dmsg0(200, "=====Start Job=========\n");
    set_jcr_job_status(jcr, JS_Running);   /* this will be set only if no error */
@@ -251,6 +266,11 @@ static void *job_thread(void *arg)
       Jmsg(jcr, M_FATAL, 0, _("Job canceled because max start delay time exceeded.\n"));
    }
 
+   if (job_check_maxschedruntime(jcr)) {
+      set_jcr_job_status(jcr, JS_Canceled);
+      Jmsg(jcr, M_FATAL, 0, _("Job canceled because max sched run time exceeded.\n"));
+   }
+
    /* TODO : check if it is used somewhere */
    if (jcr->job->RunScripts == NULL) {
       Dmsg0(200, "Warning, job->RunScripts is empty\n");
@@ -285,7 +305,7 @@ static void *job_thread(void *arg)
       }
       generate_job_event(jcr, "JobRun");
 
-      switch (jcr->JobType) {
+      switch (jcr->get_JobType()) {
       case JT_BACKUP:
          if (do_backup(jcr)) {
             do_autoprune(jcr);
@@ -314,9 +334,8 @@ static void *job_thread(void *arg)
             admin_cleanup(jcr, JS_ErrorTerminated);
          }
          break;
-      case JT_MIGRATE:
       case JT_COPY:
-      case JT_ARCHIVE:
+      case JT_MIGRATE:
          if (do_migration(jcr)) {
             do_autoprune(jcr);
          } else {
@@ -324,7 +343,7 @@ static void *job_thread(void *arg)
          }
          break;
       default:
-         Pmsg1(0, _("Unimplemented job type: %d\n"), jcr->JobType);
+         Pmsg1(0, _("Unimplemented job type: %d\n"), jcr->get_JobType());
          break;
       }
    }
@@ -380,12 +399,12 @@ bool cancel_job(UAContext *ua, JCR *jcr)
          }
          Dmsg0(200, "Connected to file daemon\n");
          fd = ua->jcr->file_bsock;
-         bnet_fsend(fd, "cancel Job=%s\n", jcr->Job);
-         while (bnet_recv(fd) >= 0) {
+         fd->fsend("cancel Job=%s\n", jcr->Job);
+         while (fd->recv() >= 0) {
             ua->send_msg("%s", fd->msg);
          }
-         bnet_sig(fd, BNET_TERMINATE);
-         bnet_close(fd);
+         fd->signal(BNET_TERMINATE);
+         fd->close();
          ua->jcr->file_bsock = NULL;
       }
 
@@ -426,6 +445,46 @@ bool cancel_job(UAContext *ua, JCR *jcr)
    return true;
 }
 
+void cancel_storage_daemon_job(JCR *jcr)
+{
+   UAContext *ua = new_ua_context(jcr);
+   JCR *control_jcr = new_control_jcr("*JobCancel*", JT_SYSTEM);
+   BSOCK *sd;
+
+   ua->jcr = control_jcr;
+   if (jcr->store_bsock) {
+      if (!ua->jcr->wstorage) {
+         if (jcr->rstorage) {
+            copy_wstorage(ua->jcr, jcr->rstorage, _("Job resource")); 
+         } else {
+            copy_wstorage(ua->jcr, jcr->wstorage, _("Job resource")); 
+         }
+      } else {
+         USTORE store;
+         if (jcr->rstorage) {
+            store.store = jcr->rstore;
+         } else {
+            store.store = jcr->wstore;
+         }
+         set_wstorage(ua->jcr, &store);
+      }
+
+      if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
+         goto bail_out;
+      }
+      Dmsg0(200, "Connected to storage daemon\n");
+      sd = ua->jcr->store_bsock;
+      sd->fsend("cancel Job=%s\n", jcr->Job);
+      while (sd->recv() >= 0) {
+      }
+      sd->signal(BNET_TERMINATE);
+      sd->close();
+      ua->jcr->store_bsock = NULL;
+   }
+bail_out:
+   free_jcr(control_jcr);
+   free_ua_context(ua);
+}
 
 static void job_monitor_destructor(watchdog_t *self)
 {
@@ -440,6 +499,7 @@ static void job_monitor_watchdog(watchdog_t *self)
 
    control_jcr = (JCR *)self->data;
 
+   Dsm_check(1);
    Dmsg1(800, "job_monitor_watchdog %p called\n", self);
 
    foreach_jcr(jcr) {
@@ -451,14 +511,19 @@ static void job_monitor_watchdog(watchdog_t *self)
       }
 
       /* check MaxWaitTime */
-      if (job_check_maxwaittime(control_jcr, jcr)) {
+      if (job_check_maxwaittime(jcr)) {
          set_jcr_job_status(jcr, JS_Canceled);
-         Jmsg(jcr, M_FATAL, 0, _("Max wait time exceeded. Job canceled.\n"));
+         Qmsg(jcr, M_FATAL, 0, _("Max wait time exceeded. Job canceled.\n"));
          cancel = true;
       /* check MaxRunTime */
-      } else if (job_check_maxruntime(control_jcr, jcr)) {
+      } else if (job_check_maxruntime(jcr)) {
+         set_jcr_job_status(jcr, JS_Canceled);
+         Qmsg(jcr, M_FATAL, 0, _("Max run time exceeded. Job canceled.\n"));
+         cancel = true;
+      /* check MaxRunSchedTime */ 
+      } else if (job_check_maxschedruntime(jcr)) {
          set_jcr_job_status(jcr, JS_Canceled);
-         Jmsg(jcr, M_FATAL, 0, _("Max run time exceeded. Job canceled.\n"));
+         Qmsg(jcr, M_FATAL, 0, _("Max sched run time exceeded. Job canceled.\n"));
          cancel = true;
       }
 
@@ -480,47 +545,71 @@ static void job_monitor_watchdog(watchdog_t *self)
  * Check if the maxwaittime has expired and it is possible
  *  to cancel the job.
  */
-static bool job_check_maxwaittime(JCR *control_jcr, JCR *jcr)
+static bool job_check_maxwaittime(JCR *jcr)
 {
    bool cancel = false;
    JOB *job = jcr->job;
 
-   if (job_canceled(jcr)) {
-      return false;                /* already canceled */
+   if (!job_waiting(jcr)) {
+      return false;
+   }
+   Dmsg3(200, "check maxwaittime %u - %u >= %u\n", watchdog_time, jcr->wait_time, job->MaxWaitTime);
+   if (job->MaxWaitTime != 0 &&
+       (watchdog_time - jcr->wait_time) >= job->MaxWaitTime) {
+      cancel = true;
+   }
+
+   return cancel;
+}
+
+/*
+ * Check if maxruntime has expired and if the job can be
+ *   canceled.
+ */
+static bool job_check_maxruntime(JCR *jcr)
+{
+   bool cancel = false;
+   JOB *job = jcr->job;
+
+   if (job_canceled(jcr) || jcr->JobStatus == JS_Created) {
+      return false;
    }
-   if (job->MaxWaitTime == 0 && job->FullMaxWaitTime == 0 &&
-       job->IncMaxWaitTime == 0 && job->DiffMaxWaitTime == 0) {
+   if (jcr->job->MaxRunTime == 0 && job->FullMaxRunTime == 0 &&
+       job->IncMaxRunTime == 0 && job->DiffMaxRunTime == 0) {
       return false;
-   } 
-   if (jcr->JobLevel == L_FULL && job->FullMaxWaitTime != 0 &&
-         (watchdog_time - jcr->start_time) >= job->FullMaxWaitTime) {
+   }
+   Dmsg6(200, "check_maxruntime %u - %u >= %u|%u|%u|%u\n\n",
+         watchdog_time, jcr->start_time, job->MaxRunTime, job->FullMaxRunTime, 
+         job->IncMaxRunTime, job->DiffMaxRunTime);
+
+   if (jcr->get_JobLevel() == L_FULL && job->FullMaxRunTime != 0 &&
+         (watchdog_time - jcr->start_time) >= job->FullMaxRunTime) {
       cancel = true;
-   } else if (jcr->JobLevel == L_DIFFERENTIAL && job->DiffMaxWaitTime != 0 &&
-         (watchdog_time - jcr->start_time) >= job->DiffMaxWaitTime) {
+   } else if (jcr->get_JobLevel() == L_DIFFERENTIAL && job->DiffMaxRunTime != 0 &&
+         (watchdog_time - jcr->start_time) >= job->DiffMaxRunTime) {
       cancel = true;
-   } else if (jcr->JobLevel == L_INCREMENTAL && job->IncMaxWaitTime != 0 &&
-         (watchdog_time - jcr->start_time) >= job->IncMaxWaitTime) {
+   } else if (jcr->get_JobLevel() == L_INCREMENTAL && job->IncMaxRunTime != 0 &&
+         (watchdog_time - jcr->start_time) >= job->IncMaxRunTime) {
       cancel = true;
-   } else if (job->MaxWaitTime != 0 &&
-         (watchdog_time - jcr->start_time) >= job->MaxWaitTime) {
+   } else if ((watchdog_time - jcr->start_time) >= job->MaxRunTime) {
       cancel = true;
    }
-
+ 
    return cancel;
 }
 
 /*
- * Check if maxruntime has expired and if the job can be
+ * Check if MaxRunSchedTime has expired and if the job can be
  *   canceled.
  */
-static bool job_check_maxruntime(JCR *control_jcr, JCR *jcr)
+static bool job_check_maxschedruntime(JCR *jcr)
 {
-   if (jcr->job->MaxRunTime == 0 || job_canceled(jcr)) {
+   if (jcr->job->MaxRunSchedTime == 0 || job_canceled(jcr)) {
       return false;
    }
-   if ((watchdog_time - jcr->start_time) < jcr->job->MaxRunTime) {
-      Dmsg3(200, "Job %p (%s) with MaxRunTime %d not expired\n",
-            jcr, jcr->Job, jcr->job->MaxRunTime);
+   if ((watchdog_time - jcr->sched_time) < jcr->job->MaxRunSchedTime) {
+      Dmsg3(200, "Job %p (%s) with MaxRunSchedTime %d not expired\n",
+            jcr, jcr->Job, jcr->job->MaxRunSchedTime);
       return false;
    }
 
@@ -543,28 +632,93 @@ DBId_t get_or_create_pool_record(JCR *jcr, char *pool_name)
    while (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */
       /* Try to create the pool */
       if (create_pool(jcr, jcr->db, jcr->pool, POOL_OP_CREATE) < 0) {
-         Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name,
+         Jmsg(jcr, M_FATAL, 0, _("Pool \"%s\" not in database. ERR=%s"), pr.Name,
             db_strerror(jcr->db));
          return 0;
       } else {
-         Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name);
+         Jmsg(jcr, M_INFO, 0, _("Created database record for Pool \"%s\".\n"), pr.Name);
       }
    }
    return pr.PoolId;
 }
 
+/*
+ * Check for duplicate jobs.
+ *  Returns: true  if current job should continue
+ *           false if current job should terminate
+ */
+bool allow_duplicate_job(JCR *jcr)
+{
+   JOB *job = jcr->job;
+   JCR *djcr;                /* possible duplicate */
+
+   if (job->AllowDuplicateJobs) {
+      return true;
+   }
+   if (!job->AllowHigherDuplicates) {
+      foreach_jcr(djcr) {
+         char ec1[50];
+         if (strcmp(job->name(), djcr->job->name()) == 0) {
+            bool cancel_queued = false;
+            if (job->DuplicateJobProximity > 0) {
+               time_t now = time(NULL);
+               if ((now - djcr->start_time) > job->DuplicateJobProximity) {
+                  continue;               /* not really a duplicate */
+               }
+            }
+            /* Cancel */
+            if (!(job->CancelQueuedDuplicates || job->CancelRunningDuplicates)) {
+               /* Zap current job */
+               Jmsg(jcr, M_FATAL, 0, _("Duplicate job not allowed. JobId=%s\n"),
+                  edit_uint64(djcr->JobId, ec1));
+               return false;
+            }
+            /* If CancelQueuedDuplicates is set do so only if job is queued */
+            if (job->CancelQueuedDuplicates) {
+                switch (djcr->JobStatus) {
+                case JS_Created:
+                case JS_WaitJobRes:
+                case JS_WaitClientRes:
+                case JS_WaitStoreRes:
+                case JS_WaitPriority:
+                case JS_WaitMaxJobs:
+                case JS_WaitStartTime:
+                   cancel_queued = true;
+                   break;
+                default:
+                   break;
+                }
+            }
+            if (cancel_queued || job->CancelRunningDuplicates) {
+               UAContext *ua = new_ua_context(djcr);
+               Jmsg(jcr, M_INFO, 0, _("Cancelling duplicate JobId=%s.\n"), 
+                  edit_uint64(djcr->JobId, ec1));
+               ua->jcr = djcr;
+               cancel_job(ua, djcr);
+               free_ua_context(ua);
+               Dmsg2(800, "Have cancelled JCR %p Job=%d\n", djcr, djcr->JobId);
+            }
+         }
+      }
+   }
+   return true;   
+}
+
 void apply_pool_overrides(JCR *jcr)
 {
+   bool pool_override = false;
+
    if (jcr->run_pool_override) {
       pm_strcpy(jcr->pool_source, _("Run pool override"));
    }
    /*
     * Apply any level related Pool selections
     */
-   switch (jcr->JobLevel) {
+   switch (jcr->get_JobLevel()) {
    case L_FULL:
       if (jcr->full_pool) {
          jcr->pool = jcr->full_pool;
+         pool_override = true;
          if (jcr->run_full_pool_override) {
             pm_strcpy(jcr->pool_source, _("Run FullPool override"));
          } else {
@@ -575,6 +729,7 @@ void apply_pool_overrides(JCR *jcr)
    case L_INCREMENTAL:
       if (jcr->inc_pool) {
          jcr->pool = jcr->inc_pool;
+         pool_override = true;
          if (jcr->run_inc_pool_override) {
             pm_strcpy(jcr->pool_source, _("Run IncPool override"));
          } else {
@@ -585,6 +740,7 @@ void apply_pool_overrides(JCR *jcr)
    case L_DIFFERENTIAL:
       if (jcr->diff_pool) {
          jcr->pool = jcr->diff_pool;
+         pool_override = true;
          if (jcr->run_diff_pool_override) {
             pm_strcpy(jcr->pool_source, _("Run DiffPool override"));
          } else {
@@ -593,6 +749,11 @@ void apply_pool_overrides(JCR *jcr)
       }
       break;
    }
+   /* Update catalog if pool overridden */
+   if (pool_override && jcr->pool->catalog) {
+      jcr->catalog = jcr->pool->catalog;
+      pm_strcpy(jcr->catalog_source, _("Pool resource"));
+   }
 }
 
 
@@ -671,8 +832,8 @@ void init_jcr_job_record(JCR *jcr)
    jcr->jr.SchedTime = jcr->sched_time;
    jcr->jr.StartTime = jcr->start_time;
    jcr->jr.EndTime = 0;               /* perhaps rescheduled, clear it */
-   jcr->jr.JobType = jcr->JobType;
-   jcr->jr.JobLevel = jcr->JobLevel;
+   jcr->jr.JobType = jcr->get_JobType();
+   jcr->jr.JobLevel = jcr->get_JobLevel();
    jcr->jr.JobStatus = jcr->JobStatus;
    jcr->jr.JobId = jcr->JobId;
    bstrncpy(jcr->jr.Name, jcr->job->name(), sizeof(jcr->jr.Name));
@@ -693,7 +854,7 @@ void update_job_end_record(JCR *jcr)
    jcr->jr.VolSessionId = jcr->VolSessionId;
    jcr->jr.VolSessionTime = jcr->VolSessionTime;
    jcr->jr.JobErrors = jcr->Errors;
-   if (!db_update_job_end_record(jcr, jcr->db, &jcr->jr)) {
+   if (!db_update_job_end_record(jcr, jcr->db, &jcr->jr, jcr->job->stats_enabled)) {
       Jmsg(jcr, M_WARNING, 0, _("Error updating job record. %s"),
          db_strerror(jcr->db));
    }
@@ -703,6 +864,10 @@ void update_job_end_record(JCR *jcr)
  * Takes base_name and appends (unique) current
  *   date and time to form unique job name.
  *
+ *  Note, the seconds are actually a sequence number. This
+ *   permits us to start a maximum fo 59 unique jobs a second, which
+ *   should be sufficient.
+ *
  *  Returns: unique job name in jcr->Job
  *    date/time in jcr->start_time
  */
@@ -711,6 +876,7 @@ void create_unique_job_name(JCR *jcr, const char *base_name)
    /* Job start mutex */
    static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
    static time_t last_start_time = 0;
+   static int seq = 0;
    time_t now;
    struct tm tm;
    char dt[MAX_TIME_LENGTH];
@@ -722,9 +888,13 @@ void create_unique_job_name(JCR *jcr, const char *base_name)
     */
    P(mutex);                          /* lock creation of jobs */
    now = time(NULL);
-   while (now == last_start_time) {
-      bmicrosleep(0, 500000);
-      now = time(NULL);
+   seq++;
+   if (seq > 59) {                    /* wrap as if it is seconds */
+      seq = 0;
+      while (now == last_start_time) {
+         bmicrosleep(0, 500000);
+         now = time(NULL);
+      }
    }
    last_start_time = now;
    V(mutex);                          /* allow creation of jobs */
@@ -732,10 +902,10 @@ void create_unique_job_name(JCR *jcr, const char *base_name)
    /* Form Unique JobName */
    (void)localtime_r(&now, &tm);
    /* Use only characters that are permitted in Windows filenames */
-   strftime(dt, sizeof(dt), "%Y-%m-%d_%H.%M.%S", &tm);
+   strftime(dt, sizeof(dt), "%Y-%m-%d_%H.%M", &tm);
    bstrncpy(name, base_name, sizeof(name));
    name[sizeof(name)-22] = 0;          /* truncate if too long */
-   bsnprintf(jcr->Job, sizeof(jcr->Job), "%s.%s", name, dt); /* add date & time */
+   bsnprintf(jcr->Job, sizeof(jcr->Job), "%s.%s.%02d", name, dt, seq); /* add date & time */
    /* Convert spaces into underscores */
    for (p=jcr->Job; *p; p++) {
       if (*p == ' ') {
@@ -802,14 +972,14 @@ void dird_free_jcr(JCR *jcr)
       pthread_cond_destroy(&jcr->term_wait);
       jcr->term_wait_inited = false;
    }
+   if (jcr->db_batch && jcr->db_batch != jcr->db) {
+      db_close_database(jcr, jcr->db_batch);
+   }
+   jcr->db_batch = NULL;
    if (jcr->db) {
       db_close_database(jcr, jcr->db);
       jcr->db = NULL;
    }
-   if (jcr->db_batch) {
-      db_close_database(jcr, jcr->db_batch);
-      jcr->db_batch = NULL;
-   }
    if (jcr->stime) {
       Dmsg0(200, "Free JCR stime\n");
       free_pool_memory(jcr->stime);
@@ -824,6 +994,10 @@ void dird_free_jcr(JCR *jcr)
       free_pool_memory(jcr->pool_source);
       jcr->pool_source = NULL;
    }
+   if (jcr->catalog_source) {
+      free_pool_memory(jcr->catalog_source);
+      jcr->catalog_source = NULL;
+   }
    if (jcr->rpool_source) {
       free_pool_memory(jcr->rpool_source);
       jcr->rpool_source = NULL;
@@ -841,6 +1015,10 @@ void dird_free_jcr(JCR *jcr)
    free_rwstorage(jcr);
 
    jcr->job_end_push.destroy();
+
+   if (jcr->JobId != 0)
+      write_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
+
    Dmsg0(200, "End dird free_jcr\n");
 }
 
@@ -880,22 +1058,18 @@ void get_job_storage(USTORE *store, JOB *job, RUN *run)
 void set_jcr_defaults(JCR *jcr, JOB *job)
 {
    jcr->job = job;
-   jcr->JobType = job->JobType;
-   switch (jcr->JobType) {
+   jcr->set_JobType(job->JobType);
+   jcr->JobStatus = JS_Created;
+
+   switch (jcr->get_JobType()) {
    case JT_ADMIN:
-   case JT_RESTORE:
-      jcr->JobLevel = L_NONE;
+      jcr->set_JobLevel(L_NONE);
       break;
-   case JT_MIGRATE:
-      if (!jcr->rpool_source) {
-         jcr->rpool_source = get_pool_memory(PM_MESSAGE);
-         pm_strcpy(jcr->rpool_source, _("unknown source"));
-      }
-      /* Fall-through wanted */
    default:
-      jcr->JobLevel = job->JobLevel;
+      jcr->set_JobLevel(job->JobLevel);
       break;
    }
+
    if (!jcr->fname) {
       jcr->fname = get_pool_memory(PM_FNAME);
    }
@@ -903,6 +1077,10 @@ void set_jcr_defaults(JCR *jcr, JOB *job)
       jcr->pool_source = get_pool_memory(PM_MESSAGE);
       pm_strcpy(jcr->pool_source, _("unknown source"));
    }
+   if (!jcr->catalog_source) {
+      jcr->catalog_source = get_pool_memory(PM_MESSAGE);
+      pm_strcpy(jcr->catalog_source, _("unknown source"));
+   }
 
    jcr->JobPriority = job->Priority;
    /* Copy storage definitions -- deleted in dir_free_jcr above */
@@ -921,11 +1099,19 @@ void set_jcr_defaults(JCR *jcr, JOB *job)
    jcr->full_pool = job->full_pool;
    jcr->inc_pool = job->inc_pool;
    jcr->diff_pool = job->diff_pool;
-   jcr->catalog = job->client->catalog;
+   if (job->pool->catalog) {
+      jcr->catalog = job->pool->catalog;
+      pm_strcpy(jcr->catalog_source, _("Pool resource"));
+   } else {
+      jcr->catalog = job->client->catalog;
+      pm_strcpy(jcr->catalog_source, _("Client resource"));
+   }
    jcr->fileset = job->fileset;
    jcr->messages = job->messages;
    jcr->spool_data = job->spool_data;
+   jcr->spool_size = job->spool_size;
    jcr->write_part_after_job = job->write_part_after_job;
+   jcr->accurate = job->accurate;
    if (jcr->RestoreBootstrap) {
       free(jcr->RestoreBootstrap);
       jcr->RestoreBootstrap = NULL;
@@ -937,20 +1123,20 @@ void set_jcr_defaults(JCR *jcr, JOB *job)
    /* This can be overridden by Console program */
    jcr->verify_job = job->verify_job;
    /* If no default level given, set one */
-   if (jcr->JobLevel == 0) {
-      switch (jcr->JobType) {
+   if (jcr->get_JobLevel() == 0) {
+      switch (jcr->get_JobType()) {
       case JT_VERIFY:
-         jcr->JobLevel = L_VERIFY_CATALOG;
+         jcr->set_JobLevel(L_VERIFY_CATALOG);
          break;
       case JT_BACKUP:
-         jcr->JobLevel = L_INCREMENTAL;
+         jcr->set_JobLevel(L_INCREMENTAL);
          break;
       case JT_RESTORE:
       case JT_ADMIN:
-         jcr->JobLevel = L_NONE;
+         jcr->set_JobLevel(L_NONE);
          break;
       default:
-         jcr->JobLevel = L_FULL;
+         jcr->set_JobLevel(L_FULL);
          break;
       }
    }
@@ -961,36 +1147,24 @@ void set_jcr_defaults(JCR *jcr, JOB *job)
  */
 void copy_rwstorage(JCR *jcr, alist *storage, const char *where)
 {
-   switch(jcr->JobType) {
-   case JT_RESTORE:
-   case JT_VERIFY:
-   case JT_MIGRATE:
+   if (jcr->JobReads()) {
       copy_rstorage(jcr, storage, where);
-      break;
-   default:
-      copy_wstorage(jcr, storage, where);
-      break;
    }
+   copy_wstorage(jcr, storage, where);
 }
 
 
-/* Set storage override */
+/* Set storage override.  Releases any previous storage definition */
 void set_rwstorage(JCR *jcr, USTORE *store)
 {
    if (!store) {
       Jmsg(jcr, M_FATAL, 0, _("No storage specified.\n"));
       return;
    }
-   switch(jcr->JobType) {
-   case JT_RESTORE:
-   case JT_VERIFY:
-   case JT_MIGRATE:
+   if (jcr->JobReads()) {
       set_rstorage(jcr, store);
-      break;
-   default:
-      set_wstorage(jcr, store);
-      break;
    }
+   set_wstorage(jcr, store);
 }
 
 void free_rwstorage(JCR *jcr)
@@ -1024,7 +1198,7 @@ void copy_rstorage(JCR *jcr, alist *storage, const char *where)
 }
 
 
-/* Set storage override */
+/* Set storage override.  Remove all previous storage */
 void set_rstorage(JCR *jcr, USTORE *store)
 {
    STORE *storage;
@@ -1032,6 +1206,9 @@ void set_rstorage(JCR *jcr, USTORE *store)
    if (!store->store) {
       return;
    }
+   if (jcr->rstorage) {
+      free_rstorage(jcr);
+   }
    if (!jcr->rstorage) {
       jcr->rstorage = New(alist(10, not_owned_by_alist));
    }
@@ -1085,7 +1262,7 @@ void copy_wstorage(JCR *jcr, alist *storage, const char *where)
 }
 
 
-/* Set storage override */
+/* Set storage override. Remove all previous storage */
 void set_wstorage(JCR *jcr, USTORE *store)
 {
    STORE *storage;
@@ -1093,6 +1270,9 @@ void set_wstorage(JCR *jcr, USTORE *store)
    if (!store->store) {
       return;
    }
+   if (jcr->wstorage) {
+      free_wstorage(jcr);
+   }
    if (!jcr->wstorage) {
       jcr->wstorage = New(alist(10, not_owned_by_alist));
    }
@@ -1120,6 +1300,14 @@ void free_wstorage(JCR *jcr)
    jcr->wstore = NULL;
 }
 
+char *job_code_callback_clones(JCR *jcr, const char* param) 
+{
+   if (param[0] == 'p') {
+      return jcr->pool->name();
+   }
+   return NULL;
+}
+
 void create_clones(JCR *jcr)
 {
    /*
@@ -1133,7 +1321,7 @@ void create_clones(JCR *jcr)
       UAContext *ua = new_ua_context(jcr);
       ua->batch = true;
       foreach_alist(runcmd, job->run_cmds) {
-         cmd = edit_job_codes(jcr, cmd, runcmd, "");              
+         cmd = edit_job_codes(jcr, cmd, runcmd, "", job_code_callback_clones);
          Mmsg(ua->cmd, "run %s cloned=yes", cmd);
          Dmsg1(900, "=============== Clone cmd=%s\n", ua->cmd);
          parse_ua_args(ua);                 /* parse command */
@@ -1149,13 +1337,17 @@ void create_clones(JCR *jcr)
    }
 }
 
+/*
+ * Given: a JobId in jcr->previous_jr.JobId,
+ *  this subroutine writes a bsr file to restore that job.
+ */
 bool create_restore_bootstrap_file(JCR *jcr)
 {
    RESTORE_CTX rx;
    UAContext *ua;
    memset(&rx, 0, sizeof(rx));
    rx.bsr = new_bsr();
-   rx.JobIds = "";                       
+   rx.JobIds = (char *)"";                       
    rx.bsr->JobId = jcr->previous_jr.JobId;
    ua = new_ua_context(jcr);
    complete_bsr(ua, rx.bsr);
@@ -1173,3 +1365,16 @@ bool create_restore_bootstrap_file(JCR *jcr)
    jcr->needs_sd = true;
    return true;
 }
+
+bool run_console_command(JCR *jcr, const char *cmd){
+   UAContext *ua;
+   bool ok;
+
+   ua = new_ua_context(jcr);
+   Mmsg(ua->cmd, "%s", cmd);
+   Dmsg1(100, "Console command: %s\n", ua->cmd);
+   parse_ua_args(ua);
+   ok= do_a_command(ua);
+   free_ua_context(ua);
+   return ok;
+}