struct timeval tv;
struct timezone tz;
struct timespec timeout;
+ JCR *ojcr;
/*
* Get JobId and permissions from Director
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;
- strcpy(jcr->Job, job);
+ bstrncpy(jcr->Job, job, sizeof(jcr->Job));
unbash_spaces(job_name);
- jcr->job_name = get_memory(strlen(job_name) + 1);
- strcpy(jcr->job_name, job_name);
+ jcr->job_name = get_pool_memory(PM_NAME);
+ pm_strcpy(&jcr->job_name, job_name);
unbash_spaces(client_name);
- jcr->client_name = get_memory(strlen(client_name) + 1);
- strcpy(jcr->client_name, client_name);
+ jcr->client_name = get_pool_memory(PM_NAME);
+ pm_strcpy(&jcr->client_name, client_name);
unbash_spaces(fileset_name);
- jcr->fileset_name = get_memory(strlen(fileset_name) + 1);
- strcpy(jcr->fileset_name, fileset_name);
+ jcr->fileset_name = get_pool_memory(PM_NAME);
+ pm_strcpy(&jcr->fileset_name, fileset_name);
jcr->JobType = JobType;
jcr->JobLevel = level;
jcr->no_attributes = no_attributes;
jcr->spool_attributes = spool_attributes;
- jcr->fileset_md5 = get_memory(strlen(fileset_md5) + 1);
- strcpy(jcr->fileset_md5, fileset_md5);
+ jcr->fileset_md5 = get_pool_memory(PM_NAME);
+ pm_strcpy(&jcr->fileset_md5, fileset_md5);
free_memory(job);
free_memory(job_name);
free_memory(client_name);
/*
* 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
- makeSessionKey(auth_key, NULL, 1);
+ make_session_key(auth_key, NULL, 1);
bnet_fsend(dir, OKjob, jcr->VolSessionId, jcr->VolSessionTime, auth_key);
Dmsg1(110, ">dird: %s", dir->msg);
jcr->sd_auth_key = bstrdup(auth_key);
+ memset(auth_key, 0, sizeof(auth_key));
/*
* Wait for the device, media, and pool information
*/
if (!use_device_cmd(jcr)) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
+ memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
return 0;
}
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.
}
V(jcr->mutex);
+ 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, handl_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;
}
jcr->file_bsock = fd;
- jcr->file_bsock->jcr = (void *)jcr;
+ jcr->file_bsock->jcr = jcr;
Dmsg1(110, "Found Job %s\n", job_name);
P(jcr->mutex);
if (!jcr->authenticated) {
- jcr->JobStatus = JS_ErrorTerminated;
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
}
pthread_cond_signal(&jcr->job_start_wait); /* wake waiting job */
V(jcr->mutex);
if (jcr->next_dev && jcr->prev_dev) {
Emsg0(M_FATAL, 0, _("In free_jcr(), but still attached to device!!!!\n"));
}
-
+ pthread_cond_destroy(&jcr->job_start_wait);
return;
}