#include "bacula.h"
#include "stored.h"
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
/* Imported variables */
extern uint32_t VolSessionTime;
/* Responses sent to Director daemon */
static char OKjob[] = "3000 OK Job SDid=%u SDtime=%u Authorization=%s\n";
-static char BAD_job[] = "3915 Bad Job command: %s\n";
+static char BAD_job[] = "3915 Bad Job command. stat=%d CMD: %s\n";
//static char OK_query[] = "3001 OK query\n";
//static char NO_query[] = "3918 Query failed\n";
//static char BAD_query[] = "3917 Bad query command: %s\n";
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, PreferMountedVols;
-
+ int stat;
JCR *ojcr;
/*
* Get JobId and permissions from Director
*/
Dmsg1(100, "<dird: %s", dir->msg);
- if (sscanf(dir->msg, jobcmd, &JobId, job.c_str(), job_name.c_str(),
+ stat = 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, &PreferMountedVols) != 13) {
+ &write_part_after_job, &PreferMountedVols);
+ if (stat != 13) {
pm_strcpy(jcr->errmsg, dir->msg);
- bnet_fsend(dir, BAD_job, jcr->errmsg);
+ bnet_fsend(dir, BAD_job, stat, jcr->errmsg);
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;
}
* when he does, we will be released, unless the 30 minutes
* expires.
*/
- P(jcr->mutex);
+ P(mutex);
for ( ;!job_canceled(jcr); ) {
- errstat = pthread_cond_timedwait(&jcr->job_start_wait, &jcr->mutex, &timeout);
+ errstat = pthread_cond_timedwait(&jcr->job_start_wait, &mutex, &timeout);
if (errstat == 0 || errstat == ETIMEDOUT) {
break;
}
}
- V(jcr->mutex);
+ V(mutex);
memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
Dmsg1(110, "OK Authentication Job %s\n", jcr->Job);
}
- P(jcr->mutex);
if (!jcr->authenticated) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
}
pthread_cond_signal(&jcr->job_start_wait); /* wake waiting job */
- V(jcr->mutex);
free_jcr(jcr);
return;
}
*/
void stored_free_jcr(JCR *jcr)
{
+ Dmsg1(900, "stored_free_jcr JobId=%u\n", jcr->JobId);
if (jcr->file_bsock) {
bnet_close(jcr->file_bsock);
jcr->file_bsock = NULL;
free_dcr(jcr->read_dcr);
jcr->read_dcr = NULL;
}
+
+ if (jcr->read_store) {
+ DIRSTORE *store;
+ foreach_alist(store, jcr->read_store) {
+ delete store->device;
+ delete store;
+ }
+ delete jcr->read_store;
+ jcr->read_store = NULL;
+ }
+ if (jcr->write_store) {
+ DIRSTORE *store;
+ foreach_alist(store, jcr->write_store) {
+ delete store->device;
+ delete store;
+ }
+ delete jcr->write_store;
+ jcr->write_store = NULL;
+ }
+
return;
}