*
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
/* 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\n";
+type=%d level=%d FileSet=%127s NoAttr=%d SpoolAttr=%d FileSetMD5=%127s\n";
static char use_device[] = "use device=%s media_type=%s pool_name=%s pool_type=%s\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\n";
-static char NO_device[] = "3914 Device %s not available\n";
+static char NO_device[] = "3914 Device \"%s\" not in SD Device resources.\n";
static char BAD_use[] = "3913 Bad use command: %s\n";
static char BAD_job[] = "3915 Bad Job command: %s\n";
int JobId, errstat;
char auth_key[100];
BSOCK *dir = jcr->dir_bsock;
- POOLMEM *job_name, *client_name, *job, *fileset_name;
+ POOLMEM *job_name, *client_name, *job, *fileset_name, *fileset_md5;
int JobType, level, spool_attributes, no_attributes;
struct timeval tv;
struct timezone tz;
job_name = get_memory(dir->msglen);
client_name = get_memory(dir->msglen);
fileset_name = get_memory(dir->msglen);
+ fileset_md5 = get_memory(dir->msglen);
if (sscanf(dir->msg, jobcmd, &JobId, job, job_name, client_name,
&JobType, &level, fileset_name, &no_attributes,
- &spool_attributes) != 9) {
- bnet_fsend(dir, BAD_job, dir->msg);
- Emsg1(M_FATAL, 0, _("Bad Job Command from Director: %s\n"), dir->msg);
+ &spool_attributes, fileset_md5) != 10) {
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ bnet_fsend(dir, BAD_job, jcr->errmsg);
+ Emsg1(M_FATAL, 0, _("Bad Job Command from Director: %s\n"), jcr->errmsg);
free_memory(job);
free_memory(job_name);
free_memory(client_name);
free_memory(fileset_name);
- jcr->JobStatus = JS_ErrorTerminated;
+ free_memory(fileset_md5);
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
jcr->JobId = JobId;
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);
free_memory(job);
free_memory(job_name);
free_memory(client_name);
free_memory(fileset_name);
+ free_memory(fileset_md5);
/* Initialize FD start condition variable */
if ((errstat = pthread_cond_init(&jcr->job_start_wait, NULL)) != 0) {
- Emsg1(M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat));
- jcr->JobStatus = JS_ErrorTerminated;
+ Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat));
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
jcr->authenticated = FALSE;
/*
* 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);
bnet_fsend(dir, OKjob, jcr->VolSessionId, jcr->VolSessionTime, auth_key);
Dmsg1(110, ">dird: %s", dir->msg);
jcr->sd_auth_key = bstrdup(auth_key);
* Wait for the device, media, and pool information
*/
if (!use_device_cmd(jcr)) {
- jcr->JobStatus = JS_ErrorTerminated;
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
- jcr->JobStatus = JS_WaitFD; /* wait for FD to connect */
+ set_jcr_job_status(jcr, JS_WaitFD); /* wait for FD to connect */
dir_send_job_status(jcr);
gettimeofday(&tv, &tz);
Dmsg1(200, "%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.
+ */
P(jcr->mutex);
- for ( ;!job_cancelled(jcr); ) {
+ for ( ;!job_canceled(jcr); ) {
errstat = pthread_cond_timedwait(&jcr->job_start_wait, &jcr->mutex, &timeout);
if (errstat == 0 || errstat == ETIMEDOUT) {
break;
}
V(jcr->mutex);
- if (jcr->authenticated && !job_cancelled(jcr)) {
+ if (jcr->authenticated && !job_canceled(jcr)) {
run_job(jcr); /* Run the job */
}
return 0;
}
Dmsg1(100, "got: %s\n", fd->msg);
- if (sscanf(fd->msg, "Hello Start Job %127s\n", job_name) != 1) {
- Emsg1(M_FATAL, 0, _("Authentication failure: %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);
Dmsg1(110, "Found Job %s\n", job_name);
if (jcr->authenticated) {
- Pmsg2(000, "Hey!!!! JobId %d Job %s already authenticated.\n",
+ Pmsg2(000, "Hey!!!! JobId %u Job %s already authenticated.\n",
jcr->JobId, jcr->Job);
}
DEVRES *device;
if (bnet_recv(dir) <= 0) {
- Emsg0(M_FATAL, 0, "No Device from Director\n");
+ Jmsg0(jcr, M_FATAL, 0, _("No Device from Director\n"));
return 0;
}
}
}
UnlockRes();
- Jmsg(jcr, M_FATAL, 0, _("Requested device %s not found. Cannot continue.\n"),
+ 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\" requested by Dir not found in SD Device resources.\n"),
dev_name);
bnet_fsend(dir, NO_device, dev_name);
} else {
- Jmsg(jcr, M_FATAL, 0, _("store<dir: Bad Use Device command: %s\n"), dir->msg);
- bnet_fsend(dir, BAD_use, dir->msg);
+ 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);
}
free_memory(dev_name);
if (jcr->fileset_name) {
free_memory(jcr->fileset_name);
}
+ if (jcr->fileset_md5) {
+ free_memory(jcr->fileset_md5);
+ }
if (jcr->bsr) {
free_bsr(jcr->bsr);
jcr->bsr = NULL;