database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-10-23 13:29:09 +03:00
Code Activity

Handle concatenated gzip members in astreamer decompressor

Browse Source 
With WAL streaming, pg_basebackup -Ft -z writes pg_wal.tar.gz as a
series of gzip members.  The decompressor did not reset the inflate
state when one ended, so inflate consumed nothing more and the loop
never finished.  This caused pg_waldump to hang on such backups and
as a consequence pg_verifybackup (which use pg_waldump) would hang.

A test is added to pg_verifybackup for checking a gzip-compressed
tar backup, which in turn will verify that pg_waldump works.

Author: Shihao Zhong <zhong950419@gmail.com>
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Reviewed-by: Andrew Dunstan <andrew@dunslane.net>
Discussion: https://postgr.es/m/CAGRkXqTcyuog_MzKqQm+am2xMefLFJTSKaRevnfypDWirCFvdA@mail.gmail.com
Backpatch-through: 19
This commit is contained in:
Daniel Gustafsson
2026-10-08 21:54:44 +02:00
parent 2604c28bf5
commit 39c2969eb0
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/bin/pg_verifybackup/t/007_wal.pl
View File

@@ -105,4 +105,26 @@ $primary->command_ok(
command_ok([ 'pg_verifybackup', $backup_path3 ],
'WAL verification succeeds with separate pg_wal.tar');
# Same with client-side gzip compression. pg_basebackup writes pg_wal.tar.gz
# as several concatenated gzip members.
SKIP:
{
skip "gzip compression not supported by this build", 2
if !check_pg_config("#define HAVE_LIBZ 1");
my $backup_path4 = $primary->backup_dir . '/test_tar_gz_wal';
$primary->command_ok(
[
'pg_basebackup',
'--pgdata' => $backup_path4,
'--no-sync',
'--format' => 'tar',
'--gzip',
'--checkpoint' => 'fast'
],
"tar backup with separate pg_wal.tar.gz");
command_ok([ 'pg_verifybackup', $backup_path4 ],
'WAL verification succeeds with separate pg_wal.tar.gz');
}
done_testing();

8
src/fe_utils/astreamer_gzip.c
View File

@@ -333,6 +333,14 @@ astreamer_gzip_decompressor_content(astreamer *streamer,
mystreamer->base.bbs_buffer.maxlen, context);
mystreamer->bytes_written = 0;
}
/*
* The input can be several gzip members one after another, which is
* what pg_basebackup writes for pg_wal.tar.gz. Get ready for the
* next one.
*/
if (res == Z_STREAM_END && inflateReset(zs) != Z_OK)
pg_fatal("could not reset compression stream");
}
}