Start FileSet filtering

[bacula/bacula] / bacula / src / filed / backup.c

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 05923c2dcaad26d4fb69e3dc2f6ac94b22677290..0e7a69627d53ff99f590a22e4132cd755e75c8ef 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -53,9 +53,18 @@ 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);
-
-   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;
    }
@@ -70,9 +79,9 @@ int blast_data_to_storage_daemon(JCR *jcr, char *addr)
    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);
-   set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime, jcr->mtime_only);
-   Dmsg0(110, "start find files\n");
+   Dmsg1(300, "set_find_options ff=%p\n", jcr->ff);
+   set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
+   Dmsg0(300, "start find files\n");
 
    start_heartbeat_monitor(jcr);
 
@@ -94,7 +103,7 @@ int blast_data_to_storage_daemon(JCR *jcr, char *addr)
       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;
 }         
 
@@ -139,7 +148,9 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
    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:
@@ -193,6 +204,9 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
    }
 
    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.  
@@ -202,8 +216,8 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
    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_DIREND)) {
+      btimer_t *tid;   
       if (ff_pkt->type == FT_FIFO) {
         tid = start_thread_timer(pthread_self(), 60);
       } else {
@@ -229,7 +243,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
    /* Now possibly extend the attributes */
    attr_stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
 
-   Dmsg3(200, "File %s\nattribs=%s\nattribsEx=%s\n", ff_pkt->fname, attribs, attribsEx);
+   Dmsg3(300, "File %s\nattribs=%s\nattribsEx=%s\n", ff_pkt->fname, attribs, attribsEx);
      
    P(jcr->mutex);
    jcr->JobFiles++;                   /* increment number of files sent */
@@ -248,7 +262,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
       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
@@ -263,11 +277,11 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
     * 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);
@@ -276,7 +290,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
               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);
@@ -300,7 +314,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
       wbuf = sd->msg;                /* write buffer */
 
 
-      Dmsg1(100, "Saving data, type=%d\n", ff_pkt->type);
+      Dmsg1(300, "Saving data, type=%d\n", ff_pkt->type);
 
 
 #ifdef HAVE_LIBZ
@@ -328,7 +342,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
         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);
@@ -343,12 +357,19 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
       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 */
@@ -438,7 +459,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
    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);
@@ -449,7 +470,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
    /* 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);