X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Fbackup.c;h=07bbc264d1c4ca6e25947988c4d3a66c0a71afc3;hb=15c06734e3a9ef88d4b9562a2500d50a0aa9c526;hp=4e91bfdbe8267dd43c07d69db933b73449d01de3;hpb=c52a4e2a6649118db4c65cb733da6363b9d6699f;p=bacula%2Fbacula diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c index 4e91bfdbe8..07bbc264d1 100644 --- a/bacula/src/filed/backup.c +++ b/bacula/src/filed/backup.c @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Bacula® is a registered trademark of John Walker. + Bacula® is a registered trademark of Kern Sibbald. The licensor of Bacula is the Free Software Foundation Europe (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. @@ -39,16 +39,30 @@ #include "filed.h" /* Forward referenced functions */ -int save_file(FF_PKT *ff_pkt, void *pkt, bool top_level); -static void strip_path(FF_PKT *ff_pkt); -static void unstrip_path(FF_PKT *ff_pkt); +int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level); static int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, DIGEST *digest, DIGEST *signature_digest); -static bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream); +bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream); static bool read_and_send_acl(JCR *jcr, int acltype, int stream); static bool crypto_session_start(JCR *jcr); static void crypto_session_end(JCR *jcr); static bool crypto_session_send(JCR *jcr, BSOCK *sd); +/* + * check for BSD nodump flag + */ +static bool no_dump(JCR *jcr, FF_PKT *ff_pkt) +{ +#if defined(HAVE_CHFLAGS) && defined(UF_NODUMP) + if ( (ff_pkt->flags & FO_HONOR_NODUMP) && + (ff_pkt->statp.st_flags & UF_NODUMP) ) { + Jmsg(jcr, M_INFO, 1, _(" NODUMP flag set - will not process %s\n"), + ff_pkt->fname); + return true; /* do not backup this file */ + } +#endif + return false; /* do backup */ +} + /* * Find all the requested files and send them * to the Storage daemon. @@ -82,7 +96,7 @@ bool blast_data_to_storage_daemon(JCR *jcr, char *addr) } else { buf_size = 0; /* use default */ } - if (!bnet_set_buffer_size(sd, buf_size, BNET_SETBUF_WRITE)) { + if (!sd->set_buffer_size(buf_size, BNET_SETBUF_WRITE)) { set_jcr_job_status(jcr, JS_ErrorTerminated); Jmsg(jcr, M_FATAL, 0, _("Cannot set buffer size FD->SD.\n")); return false; @@ -90,17 +104,18 @@ bool blast_data_to_storage_daemon(JCR *jcr, char *addr) jcr->buf_size = sd->msglen; /* Adjust for compression so that output buffer is - * 12 bytes + 0.1% larger than input buffer plus 18 bytes. - * This gives a bit extra plus room for the sparse addr if any. - * Note, we adjust the read size to be smaller so that the - * same output buffer can be used without growing it. + * 12 bytes + 0.1% larger than input buffer plus 18 bytes. + * This gives a bit extra plus room for the sparse addr if any. + * Note, we adjust the read size to be smaller so that the + * same output buffer can be used without growing it. * - * The zlib compression workset is initialized here to minimise - * the "per file" load. The jcr member is only set, if the init was successful. + * The zlib compression workset is initialized here to minimize + * the "per file" load. The jcr member is only set, if the init + * was successful. */ jcr->compress_buf_size = jcr->buf_size + ((jcr->buf_size+999) / 1000) + 30; jcr->compress_buf = get_memory(jcr->compress_buf_size); - + #ifdef HAVE_LIBZ z_stream *pZlibStream = (z_stream*)malloc(sizeof(z_stream)); if (pZlibStream) { @@ -121,20 +136,25 @@ bool blast_data_to_storage_daemon(JCR *jcr, char *addr) return false; } - 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"); + /* in accurate mode, we overwrite the find_one check function */ + if (jcr->accurate) { + set_find_changed_function((FF_PKT *)jcr->ff, accurate_check_file); + } + start_heartbeat_monitor(jcr); jcr->acl_text = get_pool_memory(PM_MESSAGE); /* Subroutine save_file() is called for each file */ - if (!find_files(jcr, (FF_PKT *)jcr->ff, save_file, (void *)jcr)) { + if (!find_files(jcr, (FF_PKT *)jcr->ff, save_file, plugin_save)) { ok = false; /* error */ set_jcr_job_status(jcr, JS_ErrorTerminated); } + accurate_send_deleted_list(jcr); /* send deleted list to SD */ + free_pool_memory(jcr->acl_text); stop_heartbeat_monitor(jcr); @@ -238,6 +258,7 @@ static bool crypto_session_send(JCR *jcr, BSOCK *sd) return true; } + /* * Called here by find() for each file included. * This is a callback. The original is find_files() above. @@ -248,7 +269,7 @@ static bool crypto_session_send(JCR *jcr, BSOCK *sd) * 0 if error * -1 to ignore file/directory (not used here) */ -int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level) +int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level) { bool do_read = false; int stat, data_stream; @@ -264,7 +285,6 @@ int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level) #else crypto_digest_t signing_algorithm = CRYPTO_DIGEST_SHA1; #endif - JCR *jcr = (JCR *)vjcr; BSOCK *sd = jcr->store_bsock; if (job_canceled(jcr)) { @@ -279,10 +299,14 @@ int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level) break; case FT_REGE: Dmsg1(130, "FT_REGE saving: %s\n", ff_pkt->fname); + if (no_dump(jcr, ff_pkt)) + return 1; has_file_data = true; break; case FT_REG: Dmsg1(130, "FT_REG saving: %s\n", ff_pkt->fname); + if (no_dump(jcr, ff_pkt)) + return 1; has_file_data = true; break; case FT_LNK: @@ -290,6 +314,8 @@ int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level) break; case FT_DIRBEGIN: jcr->num_files_examined--; /* correct file count */ + if (no_dump(jcr, ff_pkt)) /* disable recursion on nodump directories */ + ff_pkt->flags |= FO_NO_RECURSION; return 1; /* not used */ case FT_NORECURSE: Jmsg(jcr, M_INFO, 1, _(" Recursion turned off. Will not descend from %s into %s\n"), @@ -298,7 +324,7 @@ int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level) break; case FT_NOFSCHG: /* Suppress message for /dev filesystems */ - if (strncmp(ff_pkt->fname, "/dev/", 5) != 0) { + if (!is_in_fileset(ff_pkt)) { Jmsg(jcr, M_INFO, 1, _(" %s is a different filesystem. Will not descend from %s into %s\n"), ff_pkt->fname, ff_pkt->top_fname, ff_pkt->fname); } @@ -333,21 +359,21 @@ int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level) break; case FT_NOACCESS: { berrno be; - Jmsg(jcr, M_NOTSAVED, 0, _(" Could not access %s: ERR=%s\n"), ff_pkt->fname, + Jmsg(jcr, M_NOTSAVED, 0, _(" Could not access \"%s\": ERR=%s\n"), ff_pkt->fname, be.bstrerror(ff_pkt->ff_errno)); jcr->Errors++; return 1; } case FT_NOFOLLOW: { berrno be; - Jmsg(jcr, M_NOTSAVED, 0, _(" Could not follow link %s: ERR=%s\n"), + Jmsg(jcr, M_NOTSAVED, 0, _(" Could not follow link \"%s\": ERR=%s\n"), ff_pkt->fname, be.bstrerror(ff_pkt->ff_errno)); jcr->Errors++; return 1; } case FT_NOSTAT: { berrno be; - Jmsg(jcr, M_NOTSAVED, 0, _(" Could not stat %s: ERR=%s\n"), ff_pkt->fname, + Jmsg(jcr, M_NOTSAVED, 0, _(" Could not stat \"%s\": ERR=%s\n"), ff_pkt->fname, be.bstrerror(ff_pkt->ff_errno)); jcr->Errors++; return 1; @@ -361,7 +387,7 @@ int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level) return 1; case FT_NOOPEN: { berrno be; - Jmsg(jcr, M_NOTSAVED, 0, _(" Could not open directory %s: ERR=%s\n"), + Jmsg(jcr, M_NOTSAVED, 0, _(" Could not open directory \"%s\": ERR=%s\n"), ff_pkt->fname, be.bstrerror(ff_pkt->ff_errno)); jcr->Errors++; return 1; @@ -479,7 +505,7 @@ int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level) do_read = true; } - Dmsg1(100, "do_read=%d\n", do_read); + Dmsg1(400, "do_read=%d\n", do_read); if (do_read) { btimer_t *tid; @@ -493,7 +519,7 @@ int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level) if (bopen(&ff_pkt->bfd, ff_pkt->fname, O_RDONLY | O_BINARY | noatime, 0) < 0) { ff_pkt->ff_errno = errno; berrno be; - Jmsg(jcr, M_NOTSAVED, 0, _(" Cannot open %s: ERR=%s.\n"), ff_pkt->fname, + Jmsg(jcr, M_NOTSAVED, 0, _(" Cannot open \"%s\": ERR=%s.\n"), ff_pkt->fname, be.bstrerror()); jcr->Errors++; if (tid) { @@ -530,7 +556,7 @@ int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level) if (!bopen_rsrc(&ff_pkt->bfd, ff_pkt->fname, O_RDONLY | O_BINARY, 0) < 0) { ff_pkt->ff_errno = errno; berrno be; - Jmsg(jcr, M_NOTSAVED, -1, _(" Cannot open resource fork for %s: ERR=%s.\n"), + Jmsg(jcr, M_NOTSAVED, -1, _(" Cannot open resource fork for \"%s\": ERR=%s.\n"), ff_pkt->fname, be.bstrerror()); jcr->Errors++; if (is_bopen(&ff_pkt->bfd)) { @@ -805,19 +831,21 @@ int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, DIGEST *digest, /* Check for sparse blocks */ if (ff_pkt->flags & FO_SPARSE) { ser_declare; - bool haveBlock = true; + bool allZeros = false; if (sd->msglen == rsize && fileAddr+sd->msglen < (uint64_t)ff_pkt->statp.st_size || ((ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO) && (uint64_t)ff_pkt->statp.st_size == 0)) { - haveBlock = !is_buf_zero(rbuf, rsize); + allZeros = is_buf_zero(rbuf, rsize); } - if (haveBlock) { + if (!allZeros) { + /* Put file address as first data in buffer */ ser_begin(wbuf, SPARSE_FADDR_SIZE); ser_uint64(fileAddr); /* store fileAddr in begin of buffer */ } fileAddr += sd->msglen; /* update file address */ - if (!haveBlock) { + /* Skip block of all zeros */ + if (allZeros) { continue; /* skip block of zeros */ } } @@ -1048,7 +1076,7 @@ static bool read_and_send_acl(JCR *jcr, int acltype, int stream) return true; } -static bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream) +bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream) { BSOCK *sd = jcr->store_bsock; char attribs[MAXSTRING]; @@ -1102,7 +1130,9 @@ static bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_strea * For a directory, link is the same as fname, but with trailing * slash. For a linked file, link is the link. */ - strip_path(ff_pkt); + if (ff_pkt->type != FT_DELETED) { /* already stripped */ + strip_path(ff_pkt); + } if (ff_pkt->type == FT_LNK || ff_pkt->type == FT_LNKSAVED) { Dmsg2(300, "Link %s to %s\n", ff_pkt->fname, ff_pkt->link); stat = sd->fsend("%ld %d %s%c%s%c%s%c%s%c", jcr->JobFiles, @@ -1116,7 +1146,9 @@ static bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_strea stat = sd->fsend("%ld %d %s%c%s%c%c%s%c", jcr->JobFiles, ff_pkt->type, ff_pkt->fname, 0, attribs, 0, 0, attribsEx, 0); } - unstrip_path(ff_pkt); + if (ff_pkt->type != FT_DELETED) { + unstrip_path(ff_pkt); + } Dmsg2(300, ">stored: attr len=%d: %s\n", sd->msglen, sd->msg); if (!stat) { @@ -1139,9 +1171,9 @@ static bool do_strip(int count, char *in) /* Copy to first path separator -- Win32 might have c: ... */ while (*in && !IsPathSeparator(*in)) { - *out++ = *in++; + out++; in++; } - *out++ = *in++; + out++; in++; numsep++; /* one separator seen */ for (stripped=0; strippedflags & FO_STRIPPATH) || ff_pkt->strip_path <= 0) { Dmsg1(200, "No strip for %s\n", ff_pkt->fname); @@ -1179,6 +1215,12 @@ static void strip_path(FF_PKT *ff_pkt) ff_pkt->link_save = get_pool_memory(PM_FNAME); } pm_strcpy(ff_pkt->fname_save, ff_pkt->fname); + if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) { + pm_strcpy(ff_pkt->link_save, ff_pkt->link); + Dmsg2(500, "strcpy link_save=%d link=%d\n", strlen(ff_pkt->link_save), + strlen(ff_pkt->link)); + sm_check(__FILE__, __LINE__, true); + } /* * Strip path. If it doesn't succeed put it back. If @@ -1188,28 +1230,34 @@ static void strip_path(FF_PKT *ff_pkt) * Do not strip symlinks. * I.e. if either stripping fails don't strip anything. */ - if (do_strip(ff_pkt->strip_path, ff_pkt->fname)) { - /* Strip links but not symlinks */ - if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) { - pm_strcpy(ff_pkt->link_save, ff_pkt->link); - if (!do_strip(ff_pkt->strip_path, ff_pkt->link)) { - pm_strcpy(ff_pkt->link, ff_pkt->link_save); - pm_strcpy(ff_pkt->fname, ff_pkt->fname_save); - } - } - } else { - pm_strcpy(ff_pkt->fname, ff_pkt->fname_save); + if (!do_strip(ff_pkt->strip_path, ff_pkt->fname)) { + unstrip_path(ff_pkt); + goto rtn; } - Dmsg2(200, "fname=%s stripped=%s\n", ff_pkt->fname_save, ff_pkt->fname); + /* Strip links but not symlinks */ + if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) { + if (!do_strip(ff_pkt->strip_path, ff_pkt->link)) { + unstrip_path(ff_pkt); + } + } + +rtn: + Dmsg3(100, "fname=%s stripped=%s link=%s\n", ff_pkt->fname_save, ff_pkt->fname, + ff_pkt->link); } -static void unstrip_path(FF_PKT *ff_pkt) +void unstrip_path(FF_PKT *ff_pkt) { if (!(ff_pkt->flags & FO_STRIPPATH) || ff_pkt->strip_path <= 0) { return; } - pm_strcpy(ff_pkt->fname, ff_pkt->fname_save); + strcpy(ff_pkt->fname, ff_pkt->fname_save); if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) { - pm_strcpy(ff_pkt->link, ff_pkt->link_save); + Dmsg2(500, "strcpy link=%s link_save=%s\n", ff_pkt->link, + ff_pkt->link_save); + strcpy(ff_pkt->link, ff_pkt->link_save); + Dmsg2(500, "strcpy link=%d link_save=%d\n", strlen(ff_pkt->link), + strlen(ff_pkt->link_save)); + sm_check(__FILE__, __LINE__, true); } }