static int save_file(FF_PKT *ff_pkt, void *pkt);
+static void *heartbeat_thread(void *arg)
+{
+ int32_t n;
+ JCR *jcr = (JCR *)arg;
+ BSOCK *sd, *dir;
+
+ jcr->heartbeat_id = pthread_self();
+
+ /* Get our own local copy */
+ sd = dup_bsock(jcr->store_bsock);
+ dir = dup_bsock(jcr->dir_bsock);
+
+ jcr->duped_sd = sd;
+
+ /* Hang reading the socket to the SD, and every time we get
+ * a heartbeat, we simply send it on to the Director to
+ * keep him alive.
+ */
+ for ( ;; ) {
+ n = bnet_recv(sd);
+ if (is_bnet_stop(sd)) {
+ break;
+ }
+ if (n == BNET_SIGNAL && sd->msglen == BNET_HEARTBEAT) {
+ bnet_sig(dir, BNET_HEARTBEAT);
+ }
+ }
+ bnet_close(sd);
+ bnet_close(dir);
+ return NULL;
+}
+
+/* Startup the heartbeat thread -- see above */
+static void start_heartbeat_monitor(JCR *jcr)
+{
+ pthread_t hbtid;
+ jcr->duped_sd = NULL;
+ pthread_create(&hbtid, NULL, heartbeat_thread, (void *)jcr);
+}
+
+/* Terminate the heartbeat thread */
+static void stop_heartbeat_monitor(JCR *jcr)
+{
+ pthread_t hbtid = jcr->heartbeat_id;
+
+ while (jcr->duped_sd == NULL) {
+ bmicrosleep(0, 500); /* avoid race */
+ }
+ jcr->duped_sd->timed_out = 1; /* set timed_out to terminate read */
+
+ pthread_kill(hbtid, TIMEOUT_SIGNAL); /* make heartbeat thread go away */
+ pthread_join(hbtid, NULL); /* wait for him to clean up */
+}
+
/*
* Find all the requested files and send them
- * to the Storage daemon.
+ * to the Storage daemon.
+ *
+ * Note, we normally carry on a one-way
+ * conversation from this point on with the SD, simply blasting
+ * data to him. To properly know what is going on, we
+ * also run a "heartbeat" monitor which reads the socket and
+ * reacts accordingly (at the moment it has nothing to do
+ * except echo the heartbeat to the Director).
*
*/
int blast_data_to_storage_daemon(JCR *jcr, char *addr)
sd = jcr->store_bsock;
- jcr->JobStatus = JS_Running;
+ set_jcr_job_status(jcr, JS_Running);
Dmsg1(110, "bfiled: opened data connection %d to stored\n", sd->fd);
if (!bnet_set_buffer_size(sd, MAX_NETWORK_BUFFER_SIZE, BNET_SETBUF_WRITE)) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
jcr->compress_buf = get_memory(jcr->compress_buf_size);
Dmsg1(100, "set_find_options ff=%p\n", jcr->ff);
- set_find_options(jcr->ff, jcr->incremental, jcr->mtime);
+ set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
Dmsg0(110, "start find files\n");
+ start_heartbeat_monitor(jcr);
+
/* Subroutine save_file() is called for each file */
- if (!find_files(jcr->ff, save_file, (void *)jcr)) {
+ if (!find_files(jcr, (FF_PKT *)jcr->ff, save_file, (void *)jcr)) {
stat = 0; /* error */
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
}
+ stop_heartbeat_monitor(jcr);
+
bnet_sig(sd, BNET_EOD); /* end data connection */
if (jcr->big_buf) {
*
* Send the file and its data to the Storage daemon.
*/
-static int save_file(FF_PKT *ff_pkt, void *ijcr)
+static int save_file(FF_PKT *ff_pkt, void *vjcr)
{
char attribs[MAXSTRING];
char attribsEx[MAXSTRING];
int stat, stream;
struct MD5Context md5c;
+ struct SHA1Context sha1c;
int gotMD5 = 0;
- unsigned char signature[16];
+ int gotSHA1 = 0;
+ unsigned char signature[30]; /* large enough for either signature */
BSOCK *sd;
- JCR *jcr = (JCR *)ijcr;
+ JCR *jcr = (JCR *)vjcr;
POOLMEM *msgsave;
- if (job_cancelled(jcr)) {
+ if (job_canceled(jcr)) {
return 0;
}
return 1;
}
+ binit(&ff_pkt->bfd, jcr->use_win_backup_api);
+
+ /* Open any file with data that we intend to save */
if (ff_pkt->type != FT_LNKSAVED && (S_ISREG(ff_pkt->statp.st_mode) &&
ff_pkt->statp.st_size > 0) ||
ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO) {
- if ((ff_pkt->fid = open(ff_pkt->fname, O_RDONLY | O_BINARY)) < 0) {
+ btimer_id tid;
+ if (ff_pkt->type == FT_FIFO) {
+ tid = start_thread_timer(pthread_self(), 60);
+ } else {
+ tid = NULL;
+ }
+ if (bopen(&ff_pkt->bfd, ff_pkt->fname, O_RDONLY | O_BINARY, 0) < 0) {
ff_pkt->ff_errno = errno;
- Jmsg(jcr, M_NOTSAVED, -1, _(" Cannot open %s: ERR=%s.\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+ Jmsg(jcr, M_NOTSAVED, -1, _(" Cannot open %s: ERR=%s.\n"), ff_pkt->fname,
+ berror(&ff_pkt->bfd));
+ stop_thread_timer(tid);
return 1;
}
- } else {
- ff_pkt->fid = -1;
+ stop_thread_timer(tid);
}
Dmsg1(130, "bfiled: sending %s to stored\n", ff_pkt->fname);
- encode_stat(attribs, &ff_pkt->statp);
+ encode_stat(attribs, &ff_pkt->statp, ff_pkt->LinkFI);
stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
Dmsg3(200, "File %s\nattribs=%s\nattribsEx=%s\n", ff_pkt->fname, attribs, attribsEx);
P(jcr->mutex);
jcr->JobFiles++; /* increment number of files sent */
+ ff_pkt->FileIndex = jcr->JobFiles; /* return FileIndex */
pm_strcpy(&jcr->last_fname, ff_pkt->fname);
V(jcr->mutex);
* Send Attributes header to Storage daemon
* <file-index> <stream> <info>
*/
-#ifndef NO_FD_SEND_TEST
if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, stream)) {
- if (ff_pkt->fid >= 0) {
- close(ff_pkt->fid);
+ if (is_bopen(&ff_pkt->bfd)) {
+ bclose(&ff_pkt->bfd);
}
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
Dmsg1(100, ">stored: attrhdr %s\n", sd->msg);
Dmsg2(100, ">stored: attr len=%d: %s\n", sd->msglen, sd->msg);
if (!stat) {
- if (ff_pkt->fid >= 0) {
- close(ff_pkt->fid);
+ if (is_bopen(&ff_pkt->bfd)) {
+ bclose(&ff_pkt->bfd);
}
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
bnet_sig(sd, BNET_EOD); /* indicate end of attributes data */
-#endif
/*
* If the file has data, read it and send to the Storage daemon
*
*/
- if (ff_pkt->fid >= 0) {
+ if (is_bopen(&ff_pkt->bfd)) {
uint64_t fileAddr = 0; /* file address */
char *rbuf, *wbuf;
int rsize = jcr->buf_size; /* read buffer size */
}
#endif
-#ifndef NO_FD_SEND_TEST
/*
* Send Data header to Storage daemon
* <file-index> <stream> <info>
*/
if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, stream)) {
- close(ff_pkt->fid);
+ bclose(&ff_pkt->bfd);
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
Dmsg1(100, ">stored: datahdr %s\n", sd->msg);
-#endif
if (ff_pkt->flags & FO_MD5) {
MD5Init(&md5c);
+ } else if (ff_pkt->flags & FO_SHA1) {
+ SHA1Init(&sha1c);
}
/*
/*
* Read the file data
*/
- while ((sd->msglen=read(ff_pkt->fid, rbuf, rsize)) > 0) {
+ while ((sd->msglen=bread(&ff_pkt->bfd, rbuf, rsize)) > 0) {
int sparseBlock = 0;
/* Check for sparse blocks */
if (ff_pkt->flags & FO_MD5) {
MD5Update(&md5c, (unsigned char *)rbuf, sd->msglen);
gotMD5 = 1;
+ } else if (ff_pkt->flags & FO_SHA1) {
+ SHA1Update(&sha1c, (unsigned char *)rbuf, sd->msglen);
+ gotSHA1 = 1;
}
#ifdef HAVE_LIBZ
Jmsg(jcr, M_FATAL, 0, _("Compression error: %d\n"), zstat);
sd->msg = msgsave;
sd->msglen = 0;
- close(ff_pkt->fid);
+ bclose(&ff_pkt->bfd);
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
Dmsg2(400, "compressed len=%d uncompressed len=%d\n",
}
#endif
-#ifndef NO_FD_SEND_TEST
+ /* #ifndef FD_NO_SEND_TEST */
/* Send the buffer to the Storage daemon */
if (!sparseBlock) {
if (ff_pkt->flags & FO_SPARSE) {
if (!bnet_send(sd)) {
sd->msg = msgsave; /* restore read buffer */
sd->msglen = 0;
- close(ff_pkt->fid);
+ bclose(&ff_pkt->bfd);
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
}
- Dmsg1(130, "Send data to FD len=%d\n", sd->msglen);
-#endif
+ Dmsg1(130, "Send data to SD len=%d\n", sd->msglen);
+ /* #endif */
jcr->JobBytes += sd->msglen; /* count bytes saved possibly compressed */
sd->msg = msgsave; /* restore read buffer */
} /* end while read file data */
+
if (sd->msglen < 0) {
Jmsg(jcr, M_ERROR, 0, _("Read error on file %s. ERR=%s\n"),
- ff_pkt->fname, strerror(errno));
+ ff_pkt->fname, berror(&ff_pkt->bfd));
}
-#ifndef NO_FD_SEND_TEST
- bnet_sig(sd, BNET_EOD); /* indicate end of file data */
-#endif /* NO_FD_SEND_TEST */
- close(ff_pkt->fid); /* close file */
+ bclose(&ff_pkt->bfd); /* close file */
+ if (!bnet_sig(sd, BNET_EOD)) { /* indicate end of file data */
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ return 0;
+ }
}
/* Terminate any MD5 signature and send it to Storage daemon and the Director */
if (gotMD5 && ff_pkt->flags & FO_MD5) {
MD5Final(signature, &md5c);
-#ifndef NO_FD_SEND_TEST
bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_MD5_SIGNATURE);
Dmsg1(100, "bfiled>stored:header %s\n", sd->msg);
memcpy(sd->msg, signature, 16);
sd->msglen = 16;
bnet_send(sd);
bnet_sig(sd, BNET_EOD); /* end of MD5 */
-#endif
+ gotMD5 = 0;
+ } else if (gotSHA1 && ff_pkt->flags & FO_SHA1) {
+ /* Terminate any SHA1 signature and send it to Storage daemon and the Director */
+ SHA1Final(&sha1c, signature);
+ bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_SHA1_SIGNATURE);
+ Dmsg1(100, "bfiled>stored:header %s\n", sd->msg);
+ memcpy(sd->msg, signature, 20);
+ sd->msglen = 20;
+ bnet_send(sd);
+ bnet_sig(sd, BNET_EOD); /* end of SHA1 */
gotMD5 = 0;
}
return 1;
projects / bacula / bacula / blobdiff