From: Kern Sibbald Date: Wed, 22 Dec 2004 17:45:45 +0000 (+0000) Subject: Integrate Preben's restore patch. X-Git-Tag: Release-7.0.0~9018 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=304b90351fe7d4875269470c864fe560e929622f;p=bacula%2Fbacula Integrate Preben's restore patch. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1773 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/kernstodo b/bacula/kernstodo index f1c599691f..6ad5d7df15 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -26,6 +26,8 @@ Suggestions for Preben: port opened by the client. - Implement WildFile and WildDir to solve problem of saving only *.doc files. +- Bootstrap from JobMedia records. +- Optimized bootstrap. For 1.37: - Create a new GUI chapter explaining all the GUI programs. @@ -82,6 +84,28 @@ Regression tests (Jo): - Win32 systems with FAT32 can be much slower than NTFS for more than 1000 files per directory. +Design: + Storage Group (SDs?) + Device Group + - Media Type (read/write) + - Specific Devices + Device + - Media Type (read/write) + - Mount retention + - Mount wait + File Device + - Mount limit + - Max capacity + - Directory + Pool + - Media Type (read/write) + - Device Group + Media + - Autochanger Id + - List of Devices/Device Groups/Storage groups + (i.e. physical restraint) + Autochanger + - Device list 1.37 Possibilities: - Can one write tapes faster with 8192 byte block sizes? @@ -206,6 +230,12 @@ For 1.37 Testing/Documentation: perhaps if password is undefined. - Implement "from ISO-date/time every x hours/days/weeks/months" in schedules. +=== rate design + jcr->last_rate + jcr->last_runtime + MA = (last_MA * 3 + rate) / 4 + rate = (bytes - last_bytes) / (runtime - last_runtime) + ==== from Marc Schoechlin - the help-command should be more verbose (it should explain the paramters of the different @@ -1068,4 +1098,3 @@ Block Position: 0 - Implement Preben's suggestion to add File System Types = ext2, ext3 to FileSets, thus simplifying backup of *all* local partitions. - diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c index b5db573bd3..584d95be4c 100644 --- a/bacula/src/filed/restore.c +++ b/bacula/src/filed/restore.c @@ -7,7 +7,7 @@ * */ /* - Copyright (C) 2000-2004 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -45,27 +45,32 @@ static char rec_header[] = "rechdr %ld %ld %ld %ld %ld"; #ifdef HAVE_LIBZ static const char *zlib_strerror(int stat); #endif +int32_t extract_data(JCR *jcr, BFILE *bfd, POOLMEM *buf, int32_t buflen, uint64_t *addr, + uint32_t *total, int flags); #define RETRY 10 /* retry wait time */ -#ifdef HAVE_DARWIN_OS -/* helper routine for closing resource forks */ +/* + * Close a bfd check that we are at the expected file offset. + * Makes some code in set_attributes(). + * ***FIXME*** + * NOTE: set_win32_attributes() may now have to reopen the file :-( + */ int bclose_chksize(JCR *jcr, BFILE *bfd, off_t osize) { char ec1[50], ec2[50]; off_t fsize; fsize = blseek(bfd, 0, SEEK_CUR); - bclose(bfd); /* first close file */ + bclose(bfd); /* first close file */ if (fsize > 0 && fsize != osize) { - Jmsg3(jcr, M_ERROR, 0, _("File size of resource fork for restored file %s not correct. Original %s, restored %s.\n"), + Jmsg3(jcr, M_ERROR, 0, _("Size of data or stream of %s not correct. Original %s, restored %s.\n"), jcr->last_fname, edit_uint64(osize, ec1), edit_uint64(fsize, ec2)); return -1; } return 0; } -#endif /* * Restore the requested files. @@ -74,7 +79,7 @@ int bclose_chksize(JCR *jcr, BFILE *bfd, off_t osize) void do_restore(JCR *jcr) { BSOCK *sd; - int32_t stream; + int32_t stream, prev_stream; uint32_t size; uint32_t VolSessionId, VolSessionTime; int32_t file_index; @@ -82,9 +87,9 @@ void do_restore(JCR *jcr) BFILE bfd; int stat; uint32_t total = 0; /* Job total but only 32 bits for debug */ - char *wbuf; /* write buffer */ - uint32_t wsize; /* write size */ uint64_t fileAddr = 0; /* file write address */ + intmax_t want_len = 0; /* How many bytes we expect to write */ + int flags; /* Options for extract_data() */ int non_support_data = 0; int non_support_attr = 0; int non_support_rsrc = 0; @@ -95,10 +100,8 @@ void do_restore(JCR *jcr) #ifdef HAVE_ACL acl_t acl; #endif - BFILE rsrc_bfd; /* we often check if it is open */ #ifdef HAVE_DARWIN_OS - off_t rsrcAddr = 0; - off_t rsrc_len; /* original length of resource fork */ + intmax_t rsrc_len; /* original length of resource fork */ /* TODO: initialise attrList once elsewhere? */ struct attrlist attrList; @@ -106,7 +109,6 @@ void do_restore(JCR *jcr) attrList.bitmapcount = ATTR_BIT_MAP_COUNT; attrList.commonattr = ATTR_CMN_FNDRINFO; #endif - binit(&rsrc_bfd); binit(&bfd); sd = jcr->store_bsock; @@ -132,6 +134,7 @@ void do_restore(JCR *jcr) #ifdef HAVE_LIBZ uint32_t compress_buf_size = jcr->buf_size + 12 + ((jcr->buf_size+999) / 1000) + 100; jcr->compress_buf = (char *)bmalloc(compress_buf_size); + jcr->compress_buf_size = compress_buf_size; #endif /* @@ -148,25 +151,23 @@ void do_restore(JCR *jcr) * 3. Repeat step 1 */ while (bget_msg(sd) >= 0 && !job_canceled(jcr)) { - /* - * First we expect a Stream Record Header - */ + prev_stream = stream; + + /* First we expect a Stream Record Header */ if (sscanf(sd->msg, rec_header, &VolSessionId, &VolSessionTime, &file_index, &stream, &size) != 5) { - Jmsg1(jcr, M_FATAL, 0, _("Record header scan error: %s\n"), sd->msg); + Jmsg1(jcr, M_FATAL, 0, _("Record header scan error: %s\n"), sd->msg); goto bail_out; } Dmsg2(30, "Got hdr: FilInx=%d Stream=%d.\n", file_index, stream); - /* - * Now we expect the Stream Data - */ + /* * Now we expect the Stream Data */ if (bget_msg(sd) < 0) { - Jmsg1(jcr, M_FATAL, 0, _("Data record error. ERR=%s\n"), bnet_strerror(sd)); + Jmsg1(jcr, M_FATAL, 0, _("Data record error. ERR=%s\n"), bnet_strerror(sd)); goto bail_out; } if (size != (uint32_t)sd->msglen) { - Jmsg2(jcr, M_FATAL, 0, _("Actual data size %d not same as header %d\n"), sd->msglen, size); + Jmsg2(jcr, M_FATAL, 0, _("Actual data size %d not same as header %d\n"), sd->msglen, size); goto bail_out; } Dmsg1(30, "Got stream data, len=%d\n", sd->msglen); @@ -175,45 +176,40 @@ void do_restore(JCR *jcr) switch (stream) { case STREAM_UNIX_ATTRIBUTES: case STREAM_UNIX_ATTRIBUTES_EX: - Dmsg1(30, "Stream=Unix Attributes. extract=%d\n", extract); - /* If extracting, it was from previous stream, so + Dmsg1(30, "Stream=Unix Attributes. extract=%d\n", extract); + /* + * If extracting, it was from previous stream, so * close the output file. */ if (extract) { - if (!is_bopen(&bfd) && !is_bopen(&rsrc_bfd)) { - Jmsg0(jcr, M_ERROR, 0, _("Logic error output file should be open\n")); - } -#ifdef HAVE_DARWIN_OS - if (is_bopen(&rsrc_bfd)) { - bclose_chksize(jcr, &rsrc_bfd, rsrc_len); - } -#endif - if (is_bopen(&bfd)) { + if (!is_bopen(&bfd)) { + Jmsg0(jcr, M_ERROR, 0, _("Logic error output file should be open\n")); + } else { + bclose_chksize(jcr, &bfd, want_len); set_attributes(jcr, attr, &bfd); } extract = false; - Dmsg0(30, "Stop extracting.\n"); + Dmsg0(30, "Stop extracting.\n"); } - if (!unpack_attributes_record(jcr, stream, sd->msg, attr)) { goto bail_out; } if (file_index != attr->file_index) { - Jmsg(jcr, M_FATAL, 0, _("Record header file index %ld not equal record index %ld\n"), + Jmsg(jcr, M_FATAL, 0, _("Record header file index %ld not equal record index %ld\n"), file_index, attr->file_index); - Dmsg0(100, "File index error\n"); + Dmsg0(100, "File index error\n"); goto bail_out; } - Dmsg3(200, "File %s\nattrib=%s\nattribsEx=%s\n", attr->fname, + Dmsg3(200, "File %s\nattrib=%s\nattribsEx=%s\n", attr->fname, attr->attr, attr->attrEx); attr->data_stream = decode_stat(attr->attr, &attr->statp, &attr->LinkFI); if (!is_stream_supported(attr->data_stream)) { if (!non_support_data++) { - Jmsg(jcr, M_ERROR, 0, _("%s stream not supported on this Client.\n"), + Jmsg(jcr, M_ERROR, 0, _("%s stream not supported on this Client.\n"), stream_to_ascii(attr->data_stream)); } continue; @@ -221,13 +217,9 @@ void do_restore(JCR *jcr) build_attr_output_fnames(jcr, attr); -#ifdef HAVE_DARWIN_OS - from_base64(&rsrc_len, attr->attrEx); -#endif - jcr->num_files_examined++; - Dmsg1(30, "Outfile=%s\n", attr->ofname); + Dmsg1(30, "Outfile=%s\n", attr->ofname); extract = false; stat = create_file(jcr, attr, &bfd, jcr->replace); switch (stat) { @@ -243,22 +235,19 @@ void do_restore(JCR *jcr) V(jcr->mutex); jcr->JobFiles++; fileAddr = 0; + want_len = attr->statp.st_size; print_ls_output(jcr, attr); +#ifdef HAVE_DARWIN_OS + /* Only restore the resource fork for regular files */ + from_base64(&rsrc_len, attr->attrEx); + if (attr->type == FT_REG && rsrc_len > 0) { + extract = true; + } +#endif if (!extract) { /* set attributes now because file will not be extracted */ set_attributes(jcr, attr, &bfd); } -#ifdef HAVE_DARWIN_OS - if (rsrc_len > 0) { - rsrcAddr = 0; - if (bopen_rsrc(&rsrc_bfd, jcr->last_fname, O_WRONLY | O_TRUNC | O_BINARY, 0) < 0) { - Jmsg(jcr, M_ERROR, 0, _(" Cannot open resource fork for %s"), jcr->last_fname); - } else { - Dmsg0(30, "Restoring resource fork"); - extract = true; - } - } -#endif break; } break; @@ -267,188 +256,80 @@ void do_restore(JCR *jcr) case STREAM_FILE_DATA: case STREAM_SPARSE_DATA: case STREAM_WIN32_DATA: - if (extract) { - if (stream == STREAM_SPARSE_DATA) { - ser_declare; - uint64_t faddr; - char ec1[50]; - - wbuf = sd->msg + SPARSE_FADDR_SIZE; - wsize = sd->msglen - SPARSE_FADDR_SIZE; - ser_begin(sd->msg, SPARSE_FADDR_SIZE); - unser_uint64(faddr); - if (fileAddr != faddr) { - fileAddr = faddr; - if (blseek(&bfd, (off_t)fileAddr, SEEK_SET) < 0) { - berrno be; - be.set_errno(bfd.berrno); - Jmsg3(jcr, M_ERROR, 0, _("Seek to %s error on %s: ERR=%s\n"), - edit_uint64(fileAddr, ec1), attr->ofname, be.strerror()); - extract = false; - bclose(&bfd); - if (is_bopen(&rsrc_bfd)) { - bclose(&rsrc_bfd); - } - continue; - } - } - } else { - wbuf = sd->msg; - wsize = sd->msglen; - } - Dmsg2(30, "Write %u bytes, total before write=%u\n", wsize, total); - if ((uint32_t)bwrite(&bfd, wbuf, wsize) != wsize) { - Dmsg0(0, "===Write error===\n"); - berrno be; - be.set_errno(bfd.berrno); - Jmsg2(jcr, M_ERROR, 0, _("Write error on %s: ERR=%s\n"), attr->ofname, - be.strerror()); - extract = false; - bclose(&bfd); - if (is_bopen(&rsrc_bfd)) { - bclose(&rsrc_bfd); - } - continue; - } - total += wsize; - jcr->JobBytes += wsize; - jcr->ReadBytes += wsize; - fileAddr += wsize; - } - break; - - /* GZIP data stream */ case STREAM_GZIP_DATA: case STREAM_SPARSE_GZIP_DATA: case STREAM_WIN32_GZIP_DATA: -#ifdef HAVE_LIBZ - if (extract) { - uLong compress_len; - int stat; - - if (stream == STREAM_SPARSE_GZIP_DATA) { - ser_declare; - uint64_t faddr; - char ec1[50]; - wbuf = sd->msg + SPARSE_FADDR_SIZE; - wsize = sd->msglen - SPARSE_FADDR_SIZE; - ser_begin(sd->msg, SPARSE_FADDR_SIZE); - unser_uint64(faddr); - if (fileAddr != faddr) { - fileAddr = faddr; - if (blseek(&bfd, (off_t)fileAddr, SEEK_SET) < 0) { - berrno be; - be.set_errno(bfd.berrno); - Jmsg3(jcr, M_ERROR, 0, _("Seek to %s error on %s: ERR=%s\n"), - edit_uint64(fileAddr, ec1), attr->ofname, be.strerror()); - extract = false; - bclose(&bfd); - if (is_bopen(&rsrc_bfd)) { - bclose(&rsrc_bfd); - } - continue; - } - } - } else { - wbuf = sd->msg; - wsize = sd->msglen; + /* Force an expected, consistent stream type here */ + if (extract && (prev_stream == stream || prev_stream == STREAM_UNIX_ATTRIBUTES + || prev_stream == STREAM_UNIX_ATTRIBUTES_EX)) { + flags = 0; + if (stream == STREAM_SPARSE_DATA || stream == STREAM_SPARSE_GZIP_DATA) { + flags |= FO_SPARSE; } - compress_len = compress_buf_size; - Dmsg2(100, "Comp_len=%d msglen=%d\n", compress_len, wsize); - if ((stat=uncompress((Byte *)jcr->compress_buf, &compress_len, - (const Byte *)wbuf, (uLong)wsize)) != Z_OK) { - Jmsg(jcr, M_ERROR, 0, _("Uncompression error on file %s. ERR=%s\n"), - attr->ofname, zlib_strerror(stat)); - extract = false; - bclose(&bfd); - if (is_bopen(&rsrc_bfd)) { - bclose(&rsrc_bfd); - } - continue; + if (stream == STREAM_GZIP_DATA || stream == STREAM_SPARSE_GZIP_DATA + || stream == STREAM_WIN32_GZIP_DATA) { + flags |= FO_GZIP; } - - Dmsg2(100, "Write uncompressed %d bytes, total before write=%d\n", compress_len, total); - if ((uLong)bwrite(&bfd, jcr->compress_buf, compress_len) != compress_len) { - Dmsg0(0, "===Write error===\n"); - berrno be; - be.set_errno(bfd.berrno); - Jmsg2(jcr, M_ERROR, 0, _("Write error on %s: %s\n"), attr->ofname, be.strerror()); + if (extract_data(jcr, &bfd, sd->msg, sd->msglen, &fileAddr, &total, flags) < 0) { extract = false; bclose(&bfd); - if (is_bopen(&rsrc_bfd)) { - bclose(&rsrc_bfd); - } continue; } - total += compress_len; - jcr->JobBytes += compress_len; - jcr->ReadBytes += wsize; - fileAddr += compress_len; } -#else - if (extract) { - Jmsg(jcr, M_ERROR, 0, _("GZIP data stream found, but GZIP not configured!\n")); - extract = false; - bclose(&bfd); - if (is_bopen(&rsrc_bfd)) { - bclose(&rsrc_bfd); - } - continue; - } -#endif break; /* Resource fork stream - only recorded after a file to be restored */ /* Silently ignore if we cannot write - we already reported that */ case STREAM_MACOS_FORK_DATA: #ifdef HAVE_DARWIN_OS - if (is_bopen(&rsrc_bfd) && sd->msglen) { - Dmsg2(30, "Write %u bytes, total before write=%u\n", sd->msglen, total); - if (bwrite(&rsrc_bfd, sd->msg, sd->msglen) != sd->msglen) { - Dmsg0(0, "===Write error===\n"); - berrno be; - be.set_errno(rsrc_bfd.berrno); - Jmsg2(jcr, M_ERROR, 0, _("Write error on resource fork of %s: ERR=%s\n"), jcr->last_fname, - be.strerror()); - extract = false; + if (extract) { + if (prev_stream != stream) { if (is_bopen(&bfd)) { - bclose(&bfd); + bclose_chksize(jcr, &bfd, want_len); + } + if (bopen_rsrc(&bfd, jcr->last_fname, O_WRONLY | O_TRUNC | O_BINARY, 0) < 0) { + Jmsg(jcr, M_ERROR, 0, _(" Cannot open resource fork for %s"), jcr->last_fname); + extract = false; + continue; } - bclose(&rsrc_bfd); + want_len = rsrc_len; + Dmsg0(30, "Restoring resource fork"); + } + flags = 0; + if (extract_data(jcr, &bfd, sd->msg, sd->msglen, &fileAddr, &total, flags) < 0) { + extract = false; + bclose(&bfd); continue; } - total += sd->msglen; - jcr->JobBytes += sd->msglen; - jcr->ReadBytes += sd->msglen; - rsrcAddr += sd->msglen; } - break; #else non_support_rsrc++; #endif + break; case STREAM_HFSPLUS_ATTRIBUTES: #ifdef HAVE_DARWIN_OS - Dmsg0(30, "Restoring Finder Info"); + Dmsg0(30, "Restoring Finder Info"); if (sd->msglen != 32) { - Jmsg(jcr, M_ERROR, 0, _(" Invalid length of Finder Info (got %d, not 32)"), sd->msglen); + Jmsg(jcr, M_ERROR, 0, _(" Invalid length of Finder Info (got %d, not 32)"), sd->msglen); continue; } if (setattrlist(jcr->last_fname, &attrList, sd->msg, sd->msglen, 0) != 0) { - Jmsg(jcr, M_ERROR, 0, _(" Could not set Finder Info on %s"), jcr->last_fname); + Jmsg(jcr, M_ERROR, 0, _(" Could not set Finder Info on %s"), jcr->last_fname); continue; } - break; #else non_support_finfo++; #endif + break; + /*** FIXME ***/ case STREAM_UNIX_ATTRIBUTES_ACCESS_ACL: #ifdef HAVE_ACL /* Recover Acess ACL from stream and check it */ acl = acl_from_text(sd->msg); if (acl_valid(acl) != 0) { - Jmsg1(jcr, M_WARNING, 0, "Failure in the ACL of %s! FD is not able to restore it!\n", jcr->last_fname); + Jmsg1(jcr, M_WARNING, 0, "Failure in the ACL of %s! FD is not able to restore it!\n", jcr->last_fname); acl_free(acl); } @@ -456,14 +337,14 @@ case STREAM_UNIX_ATTRIBUTES_ACCESS_ACL: if (attr->type == FT_DIREND) { /* Directory */ if (acl_set_file(jcr->last_fname, ACL_TYPE_ACCESS, acl) != 0) { - Jmsg1(jcr, M_WARNING, 0, "Error! Can't restore ACL of directory: %s! Maybe system does not support ACLs!\n", jcr->last_fname); + Jmsg1(jcr, M_WARNING, 0, "Error! Can't restore ACL of directory: %s! Maybe system does not support ACLs!\n", jcr->last_fname); } /* File or Link */ } else if (acl_set_file(jcr->last_fname, ACL_TYPE_ACCESS, acl) != 0) { - Jmsg1(jcr, M_WARNING, 0, "Error! Can't restore ACL of file: %s! Maybe system does not support ACLs!\n", jcr->last_fname); + Jmsg1(jcr, M_WARNING, 0, "Error! Can't restore ACL of file: %s! Maybe system does not support ACLs!\n", jcr->last_fname); } acl_free(acl); - Dmsg1(200, "ACL of file: %s successfully restored!", jcr->last_fname); + Dmsg1(200, "ACL of file: %s successfully restored!", jcr->last_fname); break; #else non_support_acl++; @@ -474,7 +355,7 @@ case STREAM_UNIX_ATTRIBUTES_ACCESS_ACL: /* Recover Default ACL from stream and check it */ acl = acl_from_text(sd->msg); if (acl_valid(acl) != 0) { - Jmsg1(jcr, M_WARNING, 0, "Failure in the Default ACL of %s! FD is not able to restore it!\n", jcr->last_fname); + Jmsg1(jcr, M_WARNING, 0, "Failure in the Default ACL of %s! FD is not able to restore it!\n", jcr->last_fname); acl_free(acl); } @@ -482,11 +363,11 @@ case STREAM_UNIX_ATTRIBUTES_ACCESS_ACL: if (attr->type == FT_DIREND) { /* Directory */ if (acl_set_file(jcr->last_fname, ACL_TYPE_DEFAULT, acl) != 0) { - Jmsg1(jcr, M_WARNING, 0, "Error! Can't restore Default ACL of directory: %s! Maybe system does not support ACLs!\n", jcr->last_fname); + Jmsg1(jcr, M_WARNING, 0, "Error! Can't restore Default ACL of directory: %s! Maybe system does not support ACLs!\n", jcr->last_fname); } } acl_free(acl); - Dmsg1(200, "Default ACL of file: %s successfully restored!", jcr->last_fname); + Dmsg1(200, "Default ACL of file: %s successfully restored!", jcr->last_fname); break; #else non_support_acl++; @@ -501,7 +382,7 @@ case STREAM_UNIX_ATTRIBUTES_ACCESS_ACL: case STREAM_PROGRAM_NAMES: case STREAM_PROGRAM_DATA: if (!prog_name_msg) { - Pmsg0(000, "Got Program Name or Data Stream. Ignored.\n"); + Pmsg0(000, "Got Program Name or Data Stream. Ignored.\n"); prog_name_msg++; } break; @@ -509,15 +390,15 @@ case STREAM_UNIX_ATTRIBUTES_ACCESS_ACL: default: /* If extracting, wierd stream (not 1 or 2), close output file anyway */ if (extract) { - Dmsg1(30, "Found wierd stream %d\n", stream); + Dmsg1(30, "Found wierd stream %d\n", stream); if (!is_bopen(&bfd)) { - Jmsg0(jcr, M_ERROR, 0, _("Logic error output file should be open but is not.\n")); + Jmsg0(jcr, M_ERROR, 0, _("Logic error output file should be open but is not.\n")); } set_attributes(jcr, attr, &bfd); extract = false; } - Jmsg(jcr, M_ERROR, 0, _("Unknown stream=%d ignored. This shouldn't happen!\n"), stream); - Dmsg2(0, "None of above!!! stream=%d data=%s\n", stream,sd->msg); + Jmsg(jcr, M_ERROR, 0, _("Unknown stream=%d ignored. This shouldn't happen!\n"), stream); + Dmsg2(0, "None of above!!! stream=%d data=%s\n", stream,sd->msg); break; } /* end switch(stream) */ @@ -527,6 +408,7 @@ case STREAM_UNIX_ATTRIBUTES_ACCESS_ACL: * archive since we just hit an end of file, so close the file. */ if (is_bopen(&bfd)) { + bclose_chksize(jcr, &bfd, want_len); set_attributes(jcr, attr, &bfd); } set_jcr_job_status(jcr, JS_Terminated); @@ -538,12 +420,8 @@ ok_out: if (jcr->compress_buf) { free(jcr->compress_buf); jcr->compress_buf = NULL; + jcr->compress_buf_size = 0; } -#ifdef HAVE_DARWIN_OS - if (is_bopen(&rsrc_bfd)) { - bclose_chksize(jcr, &rsrc_bfd, rsrc_len); - } -#endif bclose(&bfd); free_attr(attr); Dmsg2(10, "End Do Restore. Files=%d Bytes=%" lld "\n", jcr->JobFiles, @@ -591,3 +469,82 @@ static const char *zlib_strerror(int stat) } } #endif + +/* + * In the context of jcr, write data to bfd. + * We write buflen bytes in buf at addr. addr is updated in place. + * The flags specify whether to use sparse files or compression. + * Return value is the number of bytes written, or -1 on errors. + * + * ***FIXME*** + * We update total in here. For some reason, jcr->JobBytes does not work here. + */ +int32_t extract_data(JCR *jcr, BFILE *bfd, POOLMEM *buf, int32_t buflen, uint64_t *addr, + uint32_t *total, int flags) +{ + uLong compress_len; + int stat; + char *wbuf; /* write buffer */ + uint32_t wsize; /* write size */ + uint32_t rsize; /* read size */ + + if (flags & FO_SPARSE) { + ser_declare; + uint64_t faddr; + char ec1[50]; + wbuf = buf + SPARSE_FADDR_SIZE; + rsize = buflen - SPARSE_FADDR_SIZE; + ser_begin(buf, SPARSE_FADDR_SIZE); + unser_uint64(faddr); + if (*addr != faddr) { + *addr = faddr; + if (blseek(bfd, (off_t)*addr, SEEK_SET) < 0) { + berrno be; + be.set_errno(bfd->berrno); + Jmsg3(jcr, M_ERROR, 0, _("Seek to %s error on %s: ERR=%s\n"), + edit_uint64(*addr, ec1), jcr->last_fname, be.strerror()); + return -1; + } + } + } else { + wbuf = buf; + rsize = buflen; + } + wsize = rsize; + + if (flags & FO_GZIP) { +#ifdef HAVE_LIBZ + compress_len = jcr->compress_buf_size; + Dmsg2(100, "Comp_len=%d msglen=%d\n", compress_len, wsize); + if ((stat=uncompress((Byte *)jcr->compress_buf, &compress_len, + (const Byte *)wbuf, (uLong)rsize)) != Z_OK) { + Jmsg(jcr, M_ERROR, 0, _("Uncompression error on file %s. ERR=%s\n"), + jcr->last_fname, zlib_strerror(stat)); + return -1; + } + wbuf = jcr->compress_buf; + wsize = compress_len; + Dmsg2(100, "Write uncompressed %d bytes, total before write=%d\n", compress_len, *total); +#else + Jmsg(jcr, M_ERROR, 0, _("GZIP data stream found, but GZIP not configured!\n")); + return -1; +#endif + } else { + Dmsg2(30, "Write %u bytes, total before write=%u\n", wsize, *total); + } + + if ((uLong)bwrite(bfd, wbuf, wsize) != wsize) { + Dmsg0(0, "===Write error===\n"); + berrno be; + be.set_errno(bfd->berrno); + Jmsg2(jcr, M_ERROR, 0, _("Write error on %s: %s\n"), jcr->last_fname, be.strerror()); + return -1; + } + + *total += wsize; + jcr->JobBytes += wsize; + jcr->ReadBytes += rsize; + *addr += wsize; + + return wsize; +} diff --git a/bacula/src/version.h b/bacula/src/version.h index f68f5e76df..374cee10a5 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -1,8 +1,8 @@ /* */ #undef VERSION #define VERSION "1.37.1" -#define BDATE "21 December 2004" -#define LSMDATE "21Dec04" +#define BDATE "22 December 2004" +#define LSMDATE "22Dec04" /* Debug flags */ #undef DEBUG