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)) {
+ Dmsg1(300, "bfiled: opened data connection %d to stored\n", sd->fd);
+
+ 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);
free_pool_memory(jcr->compress_buf);
jcr->compress_buf = NULL;
}
- Dmsg1(110, "end blast_data stat=%d\n", stat);
+ Dmsg1(300, "end blast_data stat=%d\n", stat);
return stat;
}
{
char attribs[MAXSTRING];
char attribsEx[MAXSTRING];
- int stat, stream;
+ int stat, attr_stream, data_stream;
struct MD5Context md5c;
struct SHA1Context sha1c;
int gotMD5 = 0;
}
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 */
+ /*
+ * 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 ||
- (is_win32_backup() && ff_pkt->type == FT_DIR)) {
- btimer_id tid;
+ (!is_portable_backup(&ff_pkt->bfd) && ff_pkt->type == FT_DIR)) {
+ btimer_t *tid;
if (ff_pkt->type == FT_FIFO) {
tid = start_thread_timer(pthread_self(), 60);
} else {
}
Dmsg1(130, "bfiled: sending %s to stored\n", ff_pkt->fname);
- 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);
+
+ /* 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 */
* Send Attributes header to Storage daemon
* <file-index> <stream> <info>
*/
- if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, stream)) {
+ 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);
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 (is_bopen(&ff_pkt->bfd)) {
bclose(&ff_pkt->bfd);
rbuf = sd->msg; /* read buffer */
wbuf = sd->msg; /* write buffer */
- Dmsg1(100, "Saving data, type=%d\n", ff_pkt->type);
- /* Note, no sparse option for win32_data */
- if (is_win32_backup()) {
- stream = STREAM_WIN32_DATA;
- ff_pkt->flags &= ~FO_SPARSE;
- } else 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_WIN32_DATA) {
- stream = STREAM_WIN32_GZIP_DATA;
- } else 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;
* Send Data header to Storage daemon
* <file-index> <stream> <info>
*/
- if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, stream)) {
+ 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);
+ Dmsg1(300, ">stored: datahdr %s\n", sd->msg);
if (ff_pkt->flags & FO_MD5) {
MD5Init(&md5c);
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=bread(&ff_pkt->bfd, rbuf, rsize)) > 0) {
+ while ((sd->msglen=(uint32_t)bread(&ff_pkt->bfd, rbuf, rsize)) > 0) {
int sparseBlock = 0;
/* Check for sparse blocks */
if (gotMD5 && ff_pkt->flags & FO_MD5) {
MD5Final(signature, &md5c);
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);
/* 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);
+ Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
memcpy(sd->msg, signature, 20);
sd->msglen = 20;
bnet_send(sd);
projects / bacula / bacula / blobdiff