From: Eric Bollengier <eric@baculasystems.com>
Date: Tue, 23 Feb 2021 09:01:38 +0000 (+0100)
Subject: Fix Verify job issue with offset stream and compressed blocks
X-Git-Tag: Release-11.3.2~517
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdd3fef72ab9c9464f2ce8023f7b1819985bb87c;p=thirdparty%2Fbacula.git

Fix Verify job issue with offset stream and compressed blocks

Description:
------------

When a Plugin generates an OFFSET stream and the FileSet uses
data compression, a Verify job (level=data) did not handle
correctly the offset header in the data stream, resulting
the following kind of message:

  Error: Compressed header version error. Got=0x4f58 want=0x1
---

diff --git a/bacula/src/filed/verify_vol.c b/bacula/src/filed/verify_vol.c
index 31a6f577c..191ff495c 100644
--- a/bacula/src/filed/verify_vol.c
+++ b/bacula/src/filed/verify_vol.c
@@ -511,7 +511,8 @@ void do_verify_volume(JCR *jcr)
 
             if (vctx.stream == STREAM_SPARSE_DATA
                 || vctx.stream == STREAM_SPARSE_COMPRESSED_DATA
-                || vctx.stream == STREAM_SPARSE_GZIP_DATA) {
+                || vctx.stream == STREAM_SPARSE_GZIP_DATA
+                || vctx.full_stream & STREAM_BIT_OFFSETS) {
                vctx.skip_sparse_header(&wbuf, &wsize);
             }