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 3230B1FF163 for ; Thu, 19 Dec 2024 11:43:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8BC72E17; Thu, 19 Dec 2024 11:43:25 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 19 Dec 2024 11:43:14 +0100 Message-Id: <20241219104316.35329-12-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241219104316.35329-1-f.ebner@proxmox.com> References: <20241219104316.35329-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.052 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH storage v3 11/13] rbd plugin: list: drop outdated error message check X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" This became outdated after Ceph commit ac547a5b7dc ("rbd: return 0 and an empty list when pool is entirely empty") 11 years ago. See also: https://tracker.ceph.com/issues/6693 Signed-off-by: Fiona Ebner --- New in v3. src/PVE/Storage/RBDPlugin.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm index a362529..ef4faa6 100644 --- a/src/PVE/Storage/RBDPlugin.pm +++ b/src/PVE/Storage/RBDPlugin.pm @@ -216,12 +216,7 @@ sub rbd_ls { my $parser = sub { $raw .= shift }; my $cmd = $rbd_cmd->($scfg, $storeid, 'ls', '-l', '--format', 'json'); - eval { - run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser); - }; - my $err = $@; - - die $err if $err && $err !~ m/doesn't contain rbd images/ ; + run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser); my $result; if ($raw eq '') { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel