This commit was manufactured by cvs2svn to create tag

[bacula/bacula] / bacula / src / stored / job.c

diff --git a/bacula/src/stored/job.c b/bacula/src/stored/job.c
index 37f732732b471936044e83cf46c872fb9dcbcd8b..6c54e6d835bff105fada120bd7678bcd6df2089c 100644 (file)
--- a/bacula/src/stored/job.c
+++ b/bacula/src/stored/job.c
@@ -70,6 +70,7 @@ int job_cmd(JCR *jcr)
    struct timeval tv;
    struct timezone tz;
    struct timespec timeout;
+   JCR *ojcr;
 
    /*
     * Get JobId and permissions from Director
@@ -95,6 +96,16 @@ int job_cmd(JCR *jcr)
       set_jcr_job_status(jcr, JS_ErrorTerminated);
       return 0;
    }
+   /*        
+    * Since this job could be rescheduled, we
+    *  check to see if we have it already. If so
+    *  free the old jcr and use the new one.
+    */
+   ojcr = get_jcr_by_full_name(job);
+   if (ojcr && !ojcr->authenticated) {
+      Dmsg2(100, "Found ojcr=0x%x Job %s\n", (unsigned)ojcr, job);
+      free_jcr(ojcr);
+   }
    jcr->JobId = JobId;
    jcr->VolSessionId = newVolSessionId();
    jcr->VolSessionTime = VolSessionTime;
@@ -131,11 +142,6 @@ int job_cmd(JCR *jcr)
    /*
     * Pass back an authorization key for the File daemon
     */
-#ifdef Old_way_not_so_good
-   gettimeofday(&tv, &tz);
-   srandom(tv.tv_usec + tv.tv_sec);
-   sprintf(auth_key, "%ld", (long)random());
-#endif
    make_session_key(auth_key, NULL, 1);
    bnet_fsend(dir, OKjob, jcr->VolSessionId, jcr->VolSessionTime, auth_key);
    Dmsg1(110, ">dird: %s", dir->msg);
@@ -159,7 +165,7 @@ int job_cmd(JCR *jcr)
    timeout.tv_sec = tv.tv_sec + 30 * 60;       /* wait 30 minutes */
 
 
-   Dmsg1(200, "%s waiting on job_start_wait\n", jcr->Job);
+   Dmsg1(100, "%s waiting on job_start_wait\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.
@@ -176,42 +182,21 @@ int job_cmd(JCR *jcr)
    memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
 
    if (jcr->authenticated && !job_canceled(jcr)) {
+      Dmsg1(100, "Running job %s\n", jcr->Job);
       run_job(jcr);                  /* Run the job */
    }
    return 0;
 }
 
 /*
- * This entry point is only called if we have a separate
- *   Storage Daemon Data port. Otherwise, the connection
- *   is made to the main port, and if it is a File daemon
- *   calling, handle_filed_connection() is called directly.
- */
-void connection_from_filed(void *arg)
-{
-   BSOCK *fd = (BSOCK *)arg;
-   char job_name[MAX_NAME_LENGTH];
-
-   Dmsg0(110, "enter connection_from_filed\n");
-   if (bnet_recv(fd) <= 0) {
-      Emsg0(M_FATAL, 0, _("Unable to authenticate Client.\n"));
-      return;
-   }
-   Dmsg1(100, "got: %s\n", fd->msg);
-
-   if (fd->msglen < 17 || fd->msglen > 17+127 ||
-       sscanf(fd->msg, "Hello Start Job %127s\n", job_name) != 1) {
-      Emsg1(M_FATAL, 0, _("Bad Hello from FD: %s\n"), fd->msg);
-      return;
-   }
-   handle_filed_connection(fd, job_name);
-   return;
-}
-
+ * After receiving a connection (in job.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 */
    if (!(jcr=get_jcr_by_full_name(job_name))) {
       Jmsg1(NULL, M_FATAL, 0, _("Job name not found: %s\n"), job_name);
       return;