From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 39B101FF150 for ; Mon, 06 Jul 2026 11:42:32 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 78AB621442; Mon, 06 Jul 2026 11:42:31 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH storage 1/3] zfspool plugin: fix regression for rollback with refquota=none Date: Mon, 6 Jul 2026 11:40:32 +0200 Message-ID: <20260706094223.54701-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260706094223.54701-1-f.ebner@proxmox.com> References: <20260706094223.54701-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1783330940752 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.043 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) 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: JB46GQS3TUZRNDUUXJHFQG2OODKQ5BO3 X-Message-ID-Hash: JB46GQS3TUZRNDUUXJHFQG2OODKQ5BO3 X-MailFrom: f.ebner@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: As reported in the community forum [0], rollback of a container with a ZFS dataset with 'refquota=none' would fail. Since commit a9315a0 ("fix #6561: zfspool: track refquota for subvolumes via user properties"), when creating a snapshot, the current refquota is saved as a user property on the snapshot. The value is queried with '-p' to get the exact parsable value. In case of 'none', it will be returned as 0. However, 'zfs set' does not accept an explicit 0 value, but requires 'none', so restoring the refquota from the user property upon rollback would fail. Special case the value 0 to fix the issue. [0]: https://forum.proxmox.com/threads/184113/ Fixes: a9315a0 ("fix #6561: zfspool: track refquota for subvolumes via user properties") Signed-off-by: Fiona Ebner --- src/PVE/Storage/ZFSPoolPlugin.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PVE/Storage/ZFSPoolPlugin.pm b/src/PVE/Storage/ZFSPoolPlugin.pm index 8630744..0531a5d 100644 --- a/src/PVE/Storage/ZFSPoolPlugin.pm +++ b/src/PVE/Storage/ZFSPoolPlugin.pm @@ -562,6 +562,7 @@ sub volume_snapshot_rollback { my $refquota = $class->zfs_get_properties($scfg, 'pve-storage:refquota', $snapshot_name); if ($refquota =~ m/^\d+$/) { + $refquota = 'none' if $refquota == 0; # zfs does not accept 0 for refquota property $class->zfs_request( $scfg, undef, 'set', "refquota=${refquota}", "$scfg->{pool}/$vname", ); -- 2.47.3