From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9E5941FF138 for ; Wed, 18 Mar 2026 13:47:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CF592364F9; Wed, 18 Mar 2026 13:47:41 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Subject: [PATCH storage 3/4] zfspool: export: skip hardcoded warning about no-preserve-encryption flag Date: Wed, 18 Mar 2026 13:40:16 +0100 Message-ID: <20260318124659.374754-4-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260318124659.374754-1-s.ivanov@proxmox.com> References: <20260318124659.374754-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773837983652 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.982 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.408 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.819 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.903 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: XFEDSQ2SUHZOCWLEMF6CIGTGSCGCBZB7 X-Message-ID-Hash: XFEDSQ2SUHZOCWLEMF6CIGTGSCGCBZB7 X-MailFrom: s.ivanov@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: currently `zfs send --no-preserve-encryption` prints: `WARNING: no-preserve-encryption flag set, sending dataset $dataset without encryption` if the dataset is encrypted. This patch skips the warning to not clutter the output, as the choice is made deliberately. [0] https://github.com/openzfs/zfs/blob/d8c08a1cea6428fa37b3a6585150b10dedfd79b8/lib/libzfs/libzfs_sendrecv.c#L616 Signed-off-by: Stoiko Ivanov --- src/PVE/Storage/ZFSPoolPlugin.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/PVE/Storage/ZFSPoolPlugin.pm b/src/PVE/Storage/ZFSPoolPlugin.pm index eaeeb9d..fcd7804 100644 --- a/src/PVE/Storage/ZFSPoolPlugin.pm +++ b/src/PVE/Storage/ZFSPoolPlugin.pm @@ -824,7 +824,17 @@ sub volume_export { } push @$cmd, '--', "$scfg->{pool}/$dataset\@$snapshot"; - run_command($cmd, output => $fd); + run_command( + $cmd, + output => $fd, + errfunc => sub { + my $line = shift; + if ($line !~ /^WARNING: no-preserve-encryption flag set, sending dataset/) { + print STDERR $line; + *STDERR->flush(); + } + }, + ); return; } -- 2.47.3