From bc6846ed93af475b079c4ab9bfa2a33c49a8a185 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Thu, 10 Mar 2022 20:16:19 -0600 Subject: [PATCH 4/4] pg_basebackup: support Zstd negative compression levels "higher than maximum" is bogus TODO: each compression methods should enforce its own levels --- src/bin/pg_basebackup/bbstreamer_zstd.c | 1 + src/common/backup_compression.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/bin/pg_basebackup/bbstreamer_zstd.c b/src/bin/pg_basebackup/bbstreamer_zstd.c index 051b97458ba..491d6106cf5 100644 --- a/src/bin/pg_basebackup/bbstreamer_zstd.c +++ b/src/bin/pg_basebackup/bbstreamer_zstd.c @@ -114,6 +114,7 @@ bbstreamer_zstd_compressor_new(bbstreamer *next, bc_specification *compress) { pg_log_error("could not set compression worker count to %d: %s", compress->workers, ZSTD_getErrorName(ret)); + exit(1); } } diff --git a/src/common/backup_compression.c b/src/common/backup_compression.c index 9fc865ff299..dbaf008af8e 100644 --- a/src/common/backup_compression.c +++ b/src/common/backup_compression.c @@ -308,13 +308,17 @@ validate_bc_specification(bc_specification *spec) else if (spec->algorithm == BACKUP_COMPRESSION_LZ4) max_level = 12; else if (spec->algorithm == BACKUP_COMPRESSION_ZSTD) + { max_level = 22; + /* The minimum level depends on the version.. */ + min_level = -7; + } else return psprintf(_("compression algorithm \"%s\" does not accept a compression level"), get_bc_algorithm_name(spec->algorithm)); if (spec->level < min_level || spec->level > max_level) - return psprintf(_("compression algorithm \"%s\" expects a compression level between %d and %d"), + return psprintf(_("compression algorithm \"%s\" expects a nonzero compression level between %d and %d"), get_bc_algorithm_name(spec->algorithm), min_level, max_level); } -- 2.17.1