From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <f.ebner@proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 16E5279A8D for <pve-devel@lists.proxmox.com>; Wed, 27 Oct 2021 14:46:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 14FB71335A for <pve-devel@lists.proxmox.com>; Wed, 27 Oct 2021 14:46:24 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9E42613351 for <pve-devel@lists.proxmox.com>; Wed, 27 Oct 2021 14:46:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 76C9345FD8 for <pve-devel@lists.proxmox.com>; Wed, 27 Oct 2021 14:46:23 +0200 (CEST) From: Fabian Ebner <f.ebner@proxmox.com> To: pve-devel@lists.proxmox.com Date: Wed, 27 Oct 2021 14:46:20 +0200 Message-Id: <20211027124620.137147-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.254 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rbdplugin.pm] Subject: [pve-devel] [PATCH storage] rbd plugin: free image: use actual command in error message X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Wed, 27 Oct 2021 12:46:24 -0000 For linked clones, the base name was included, which is confusing. Signed-off-by: Fabian Ebner <f.ebner@proxmox.com> --- PVE/Storage/RBDPlugin.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index 4bd43d5..613d32b 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -540,10 +540,10 @@ sub free_image { $class->deactivate_volume($storeid, $scfg, $volname); my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'purge', $name); - run_rbd_command($cmd, errmsg => "rbd snap purge '$volname' error"); + run_rbd_command($cmd, errmsg => "rbd snap purge '$name' error"); $cmd = $rbd_cmd->($scfg, $storeid, 'rm', $name); - run_rbd_command($cmd, errmsg => "rbd rm '$volname' error"); + run_rbd_command($cmd, errmsg => "rbd rm '$name' error"); return undef; } -- 2.30.2