/* Storage Daemon requests */
static char Job_start[] = "3010 Job %127s start\n";
static char Job_end[] =
- "3099 Job %127s end JobStatus=%d JobFiles=%d JobBytes=%" lld "\n";
+ "3099 Job %127s end JobStatus=%d JobFiles=%d JobBytes=%lld JobErrors=%u\n";
/* Forward referenced functions */
extern "C" void *msg_thread(void *arg);
bool connect_to_storage_daemon(JCR *jcr, int retry_interval,
int max_retry_time, int verbose)
{
- BSOCK *sd;
+ BSOCK *sd = new_bsock();
STORE *store;
utime_t heart_beat;
*/
Dmsg2(100, "bnet_connect to Storage daemon %s:%d\n", store->address,
store->SDport);
- sd = bnet_connect(jcr, retry_interval, max_retry_time, heart_beat,
- _("Storage daemon"), store->address,
- NULL, store->SDport, verbose);
+ sd->set_source_address(director->DIRsrc_addr);
+ if (!sd->connect(jcr, retry_interval, max_retry_time, heart_beat, _("Storage daemon"),
+ store->address, NULL, store->SDport, verbose)) {
+ sd->destroy();
+ sd = NULL;
+ }
+
if (sd == NULL) {
return false;
}
}
#endif
+static char OKbootstrap[] = "3000 OK bootstrap\n";
+
/*
* Start a job with the Storage daemon
*/
-bool start_storage_daemon_job(JCR *jcr, alist *rstore, alist *wstore)
+bool start_storage_daemon_job(JCR *jcr, alist *rstore, alist *wstore, bool send_bsr)
{
bool ok = true;
STORE *storage;
jcr->job->SpoolAttributes, jcr->fileset->MD5, jcr->spool_data,
jcr->write_part_after_job, jcr->job->PreferMountedVolumes,
edit_int64(jcr->spool_size, ed2));
- Dmsg1(100, ">stored: %s\n", sd->msg);
+ Dmsg1(100, ">stored: %s", sd->msg);
if (bget_dirmsg(sd) > 0) {
Dmsg1(100, "<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;
+ return false;
} else {
jcr->sd_auth_key = bstrdup(auth_key);
Dmsg1(150, "sd_auth_key=%s\n", jcr->sd_auth_key);
} else {
Jmsg(jcr, M_FATAL, 0, _("<stored: bad response to Job command: %s\n"),
sd->bstrerror());
- return 0;
+ return false;
+ }
+
+ if (send_bsr && (!send_bootstrap_file(jcr, sd) ||
+ !response(jcr, sd, OKbootstrap, "Bootstrap", DISPLAY_ERROR))) {
+ return false;
}
/*
BSOCK *sd;
int JobStatus;
char Job[MAX_NAME_LENGTH];
- uint32_t JobFiles;
+ uint32_t JobFiles, JobErrors;
uint64_t JobBytes;
- int stat;
pthread_detach(pthread_self());
set_jcr_in_tsd(jcr);
if (sscanf(sd->msg, Job_start, Job) == 1) {
continue;
}
- if ((stat=sscanf(sd->msg, Job_end, Job, &JobStatus, &JobFiles,
- &JobBytes)) == 4) {
+ if (sscanf(sd->msg, Job_end, Job, &JobStatus, &JobFiles,
+ &JobBytes, &JobErrors) == 5) {
jcr->SDJobStatus = JobStatus; /* termination status */
jcr->SDJobFiles = JobFiles;
jcr->SDJobBytes = JobBytes;
+ jcr->SDErrors = JobErrors;
break;
}
- Dmsg2(400, "end loop stat=%d use=%d\n", stat, jcr->use_count());
+ Dmsg1(400, "end loop use=%d\n", jcr->use_count());
}
if (is_bnet_error(sd)) {
jcr->SDJobStatus = JS_ErrorTerminated;