/*
* 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)
set_jcr_job_status(jcr, JS_Running);
- Dmsg1(110, "bfiled: opened data connection %d to stored\n", sd->fd);
+ Dmsg1(300, "bfiled: opened data connection %d to stored\n", sd->fd);
- if (!bnet_set_buffer_size(sd, MAX_NETWORK_BUFFER_SIZE, BNET_SETBUF_WRITE)) {
+ LockRes();
+ CLIENT *client = (CLIENT *)GetNextRes(R_CLIENT, NULL);
+ UnlockRes();
+ uint32_t buf_size;
+ if (client) {
+ buf_size = client->max_network_buffer_size;
+ } else {
+ buf_size = 0; /* use default */
+ }
+ if (!bnet_set_buffer_size(sd, buf_size, BNET_SETBUF_WRITE)) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
jcr->compress_buf_size = jcr->buf_size + ((jcr->buf_size+999) / 1000) + 30;
jcr->compress_buf = get_memory(jcr->compress_buf_size);
- Dmsg1(100, "set_find_options ff=%p\n", jcr->ff);
+ Dmsg1(300, "set_find_options ff=%p\n", jcr->ff);
set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
- Dmsg0(110, "start find files\n");
+ Dmsg0(300, "start find files\n");
+
+ start_heartbeat_monitor(jcr);
/* Subroutine save_file() is called for each file */
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) {
free_pool_memory(jcr->compress_buf);
jcr->compress_buf = NULL;
}
+ Dmsg1(300, "end blast_data stat=%d\n", stat);
return stat;
}
*
* 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;
+ int stat, attr_stream, data_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;
}
case FT_LNK:
Dmsg2(130, "FT_LNK saving: %s -> %s\n", ff_pkt->fname, ff_pkt->link);
break;
- case FT_DIR:
+ case FT_DIRBEGIN:
+ return 1; /* not used */
+ case FT_DIREND:
Dmsg1(130, "FT_DIR saving: %s\n", ff_pkt->link);
break;
case FT_SPEC:
case FT_NOACCESS:
Jmsg(jcr, M_NOTSAVED, -1, _(" Could not access %s: ERR=%s\n"), ff_pkt->fname,
strerror(ff_pkt->ff_errno));
+ jcr->Errors++;
return 1;
case FT_NOFOLLOW:
Jmsg(jcr, M_NOTSAVED, -1, _(" Could not follow link %s: ERR=%s\n"), ff_pkt->fname,
strerror(ff_pkt->ff_errno));
+ jcr->Errors++;
return 1;
case FT_NOSTAT:
Jmsg(jcr, M_NOTSAVED, -1, _(" Could not stat %s: ERR=%s\n"), ff_pkt->fname,
strerror(ff_pkt->ff_errno));
+ jcr->Errors++;
return 1;
case FT_DIRNOCHG:
case FT_NOCHG:
case FT_NOOPEN:
Jmsg(jcr, M_NOTSAVED, -1, _(" Could not open directory %s: ERR=%s\n"), ff_pkt->fname,
strerror(ff_pkt->ff_errno));
+ jcr->Errors++;
return 1;
default:
Jmsg(jcr, M_NOTSAVED, 0, _(" Unknown file type %d; not saved: %s\n"), ff_pkt->type, ff_pkt->fname);
+ jcr->Errors++;
return 1;
}
+ binit(&ff_pkt->bfd);
+ if (ff_pkt->flags & FO_PORTABLE) {
+ set_portable_backup(&ff_pkt->bfd); /* disable Win32 BackupRead() */
+ }
+
+ /*
+ * Open any file with data that we intend to save.
+ * Note, if is_win32_backup, we must open the Directory so that
+ * the BackupRead will save its permissions and ownership streams.
+ */
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) {
+ ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO ||
+ (!is_portable_backup(&ff_pkt->bfd) && ff_pkt->type == FT_DIREND)) {
+ btimer_t *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));
+ jcr->Errors++;
+ 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);
- stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
- Dmsg3(200, "File %s\nattribs=%s\nattribsEx=%s\n", ff_pkt->fname, attribs, attribsEx);
+
+ /* Find what data stream we will use, then encode the attributes */
+ data_stream = select_data_stream(ff_pkt);
+ encode_stat(attribs, ff_pkt, data_stream);
+
+ /* Now possibly extend the attributes */
+ attr_stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
+
+ Dmsg3(300, "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 (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, attr_stream)) {
+ 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);
+ Dmsg1(300, ">stored: attrhdr %s\n", sd->msg);
/*
* Send file attributes to Storage daemon
* slash. For a linked file, link is the link.
*/
if (ff_pkt->type == FT_LNK || ff_pkt->type == FT_LNKSAVED) {
- Dmsg2(100, "Link %s to %s\n", ff_pkt->fname, ff_pkt->link);
+ Dmsg2(300, "Link %s to %s\n", ff_pkt->fname, ff_pkt->link);
stat = bnet_fsend(sd, "%ld %d %s%c%s%c%s%c%s%c", jcr->JobFiles,
ff_pkt->type, ff_pkt->fname, 0, attribs, 0, ff_pkt->link, 0,
attribsEx, 0);
- } else if (ff_pkt->type == FT_DIR) {
+ } else if (ff_pkt->type == FT_DIREND) {
/* Here link is the canonical filename (i.e. with trailing slash) */
stat = bnet_fsend(sd, "%ld %d %s%c%s%c%c%s%c", jcr->JobFiles,
ff_pkt->type, ff_pkt->link, 0, attribs, 0, 0, attribsEx, 0);
ff_pkt->type, ff_pkt->fname, 0, attribs, 0, 0, attribsEx, 0);
}
- Dmsg2(100, ">stored: attr len=%d: %s\n", sd->msglen, sd->msg);
+ Dmsg2(300, ">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 */
rbuf = sd->msg; /* read buffer */
wbuf = sd->msg; /* write buffer */
- Dmsg1(100, "Saving data, type=%d\n", ff_pkt->type);
- if (ff_pkt->flags & FO_SPARSE) {
- stream = STREAM_SPARSE_DATA;
- } else {
- stream = STREAM_FILE_DATA;
- }
+ Dmsg1(300, "Saving data, type=%d\n", ff_pkt->type);
+
#ifdef HAVE_LIBZ
uLong compress_len, max_compress_len = 0;
const Bytef *cbuf = NULL;
if (ff_pkt->flags & FO_GZIP) {
- if (stream == STREAM_FILE_DATA) {
- stream = STREAM_GZIP_DATA;
- } else {
- stream = STREAM_SPARSE_GZIP_DATA;
- }
-
if (ff_pkt->flags & FO_SPARSE) {
cbuf = (Bytef *)jcr->compress_buf + SPARSE_FADDR_SIZE;
max_compress_len = jcr->compress_buf_size - SPARSE_FADDR_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);
+ if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, data_stream)) {
+ bclose(&ff_pkt->bfd);
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
- Dmsg1(100, ">stored: datahdr %s\n", sd->msg);
-#endif
+ Dmsg1(300, ">stored: datahdr %s\n", sd->msg);
if (ff_pkt->flags & FO_MD5) {
MD5Init(&md5c);
+ } else if (ff_pkt->flags & FO_SHA1) {
+ SHA1Init(&sha1c);
}
/*
if (ff_pkt->flags & FO_SPARSE) {
rbuf += SPARSE_FADDR_SIZE;
rsize -= SPARSE_FADDR_SIZE;
+#ifdef HAVE_FREEBSD_OS
+ /*
+ * To read FreeBSD partitions, the read size must be
+ * a multiple of 512.
+ */
+ rsize = (rsize/512) * 512;
+#endif
}
/*
* Read the file data
*/
- while ((sd->msglen=read(ff_pkt->fid, rbuf, rsize)) > 0) {
+ while ((sd->msglen=(uint32_t)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
/* Send the buffer to the Storage daemon */
if (!sparseBlock) {
if (ff_pkt->flags & FO_SPARSE) {
}
sd->msg = wbuf; /* set correct write buffer */
if (!bnet_send(sd)) {
- sd->msg = msgsave; /* restore read buffer */
+ sd->msg = msgsave; /* restore bnet 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);
+ Dmsg1(300, "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(300, "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