* Version $Id$
*/
/*
- 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
/* Commands sent to Storage daemon */
static char jobcmd[] = "JobId=%d job=%s job_name=%s client_name=%s \
-type=%d level=%d FileSet=%s NoAttr=%d SpoolAttr=%d\n";
+type=%d level=%d FileSet=%s NoAttr=%d SpoolAttr=%d FileSetMD5=%s\n";
static char use_device[] = "use device=%s media_type=%s pool_name=%s pool_type=%s\n";
/* Response from Storage daemon */
int status;
STORE *storage;
BSOCK *sd;
- char auth_key[100]; /* max 17 chars */
- char *device_name, *pool_name, *pool_type, *media_type;
- int device_name_len, pool_name_len, pool_type_len, media_type_len;
+ char auth_key[100];
+ POOLMEM *device_name, *pool_name, *pool_type, *media_type;
storage = jcr->store;
sd = jcr->store_bsock;
bash_spaces(jcr->job->hdr.name);
bash_spaces(jcr->client->hdr.name);
bash_spaces(jcr->fileset->hdr.name);
+ if (jcr->fileset->MD5[0] == 0) {
+ strcpy(jcr->fileset->MD5, "**Dummy**");
+ }
bnet_fsend(sd, jobcmd, jcr->JobId, jcr->Job, jcr->job->hdr.name,
jcr->client->hdr.name, jcr->JobType, jcr->JobLevel,
jcr->fileset->hdr.name, !jcr->pool->catalog_files,
- jcr->job->SpoolAttributes);
+ jcr->job->SpoolAttributes, jcr->fileset->MD5);
+ Dmsg1(200, "Jobcmd=%s\n", sd->msg);
unbash_spaces(jcr->job->hdr.name);
unbash_spaces(jcr->client->hdr.name);
unbash_spaces(jcr->fileset->hdr.name);
- if (bnet_recv(sd) > 0) {
+ if (bget_dirmsg(sd) > 0) {
Dmsg1(110, "<stored: %s", sd->msg);
if (sscanf(sd->msg, OKjob, &jcr->VolSessionId,
&jcr->VolSessionTime, &auth_key) != 3) {
+ Dmsg1(100, "BadJob=%s\n", sd->msg);
Jmsg(jcr, M_FATAL, 0, _("Storage daemon rejected Job command: %s\n"), sd->msg);
return 0;
} else {
/*
* Send use device = xxx media = yyy pool = zzz
*/
- device_name_len = strlen(storage->dev_name) + 1;
- media_type_len = strlen(storage->media_type) + 1;
- pool_type_len = strlen(jcr->pool->pool_type) + 1;
- pool_name_len = strlen(jcr->pool->hdr.name) + 1;
- device_name = (char *) get_memory(device_name_len);
- pool_name = (char *) get_memory(pool_name_len);
- pool_type = (char *) get_memory(pool_type_len);
- media_type = (char *) get_memory(media_type_len);
- memcpy(device_name, storage->dev_name, device_name_len);
- memcpy(media_type, storage->media_type, media_type_len);
- memcpy(pool_type, jcr->pool->pool_type, pool_type_len);
- memcpy(pool_name, jcr->pool->hdr.name, pool_name_len);
+ device_name = get_pool_memory(PM_NAME);
+ pool_name = get_pool_memory(PM_NAME);
+ pool_type = get_pool_memory(PM_NAME);
+ media_type = get_pool_memory(PM_NAME);
+ pm_strcpy(&device_name, storage->dev_name);
+ pm_strcpy(&media_type, storage->media_type);
+ pm_strcpy(&pool_type, jcr->pool->pool_type);
+ pm_strcpy(&pool_name, jcr->pool->hdr.name);
bash_spaces(device_name);
bash_spaces(media_type);
bash_spaces(pool_type);
bash_spaces(pool_name);
- sd->msg = check_pool_memory_size(sd->msg, sizeof(device_name) +
- device_name_len + media_type_len + pool_type_len + pool_name_len);
bnet_fsend(sd, use_device, device_name, media_type, pool_name, pool_type);
Dmsg1(110, ">stored: %s", sd->msg);
- status = response(sd, OK_device, "Use Device");
-
+ status = response(jcr, sd, OK_device, "Use Device", NO_DISPLAY);
+ if (!status) {
+ pm_strcpy(&pool_type, sd->msg); /* save message */
+ Jmsg(jcr, M_FATAL, 0, _("\n"
+ " Storage daemon didn't accept Device \"%s\" because:\n %s"),
+ device_name, pool_type/* sd->msg */);
+ }
free_memory(device_name);
free_memory(media_type);
free_memory(pool_name);
P(jcr->mutex);
jcr->use_count++; /* mark in use by msg thread */
+ jcr->sd_msg_thread_done = false;
+ jcr->SD_msg_chan = 0;
V(jcr->mutex);
if ((status=pthread_create(&thid, NULL, msg_thread, (void *)jcr)) != 0) {
Jmsg1(jcr, M_ABORT, 0, _("Cannot create message thread: %s\n"), strerror(status));
}
- jcr->SD_msg_chan = thid;
+ /* Wait for thread to start */
+ while (jcr->SD_msg_chan == 0) {
+ bmicrosleep(0, 50);
+ }
return 1;
}
{
JCR *jcr = (JCR *)arg;
Dmsg0(200, "End msg_thread\n");
- db_end_transaction(jcr->db); /* terminate any open transaction */
+ db_end_transaction(jcr, jcr->db); /* terminate any open transaction */
P(jcr->mutex);
- jcr->msg_thread_done = TRUE;
+ jcr->sd_msg_thread_done = true;
pthread_cond_broadcast(&jcr->term_wait); /* wakeup any waiting threads */
V(jcr->mutex);
free_jcr(jcr); /* release jcr */
uint64_t JobBytes;
int stat;
+ pthread_detach(pthread_self());
+ jcr->SD_msg_chan = pthread_self();
pthread_cleanup_push(msg_thread_cleanup, arg);
Dmsg0(200, "msg_thread\n");
sd = jcr->store_bsock;
- pthread_detach(pthread_self());
/* Read the Storage daemon's output.
*/
Dmsg0(200, "Start msg_thread loop\n");
- while ((stat=bget_msg(sd, 0)) > 0) {
+ while ((stat=bget_dirmsg(sd)) >= 0) {
Dmsg1(200, "<stored: %s", sd->msg);
if (sscanf(sd->msg, Job_start, &Job) == 1) {
continue;
if (sscanf(sd->msg, Job_end, &Job, &JobStatus, &JobFiles,
&JobBytes) == 4) {
jcr->SDJobStatus = JobStatus; /* termination status */
- jcr->JobFiles = JobFiles;
- jcr->JobBytes = JobBytes;
+ jcr->SDJobFiles = JobFiles;
+ jcr->SDJobBytes = JobBytes;
break;
}
if (sscanf(sd->msg, Job_status, &Job, &JobStatus) == 2) {
continue;
}
}
- if (stat < 0) {
+ if (is_bnet_error(sd)) {
jcr->SDJobStatus = JS_ErrorTerminated;
}
pthread_cleanup_pop(1);
void wait_for_storage_daemon_termination(JCR *jcr)
{
+ int cancel_count = 0;
/* Now wait for Storage daemon to terminate our message thread */
+ set_jcr_job_status(jcr, JS_WaitSD);
P(jcr->mutex);
- jcr->JobStatus = JS_WaitSD;
- while (!jcr->msg_thread_done && !job_cancelled(jcr)) {
+ while (!jcr->sd_msg_thread_done) {
struct timeval tv;
struct timezone tz;
struct timespec timeout;
timeout.tv_sec = tv.tv_sec + 10; /* wait 10 seconds */
Dmsg0(300, "I'm waiting for message thread termination.\n");
pthread_cond_timedwait(&jcr->term_wait, &jcr->mutex, &timeout);
+ if (job_canceled(jcr)) {
+ cancel_count++;
+ }
+ /* Give SD 30 seconds to clean up after cancel */
+ if (cancel_count == 3) {
+ break;
+ }
}
V(jcr->mutex);
+ set_jcr_job_status(jcr, JS_Terminated);
}
projects / bacula / bacula / blobdiff