From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 BC4D769C8A for ; Fri, 25 Mar 2022 11:55:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B10B0891 for ; Fri, 25 Mar 2022 11:55:19 +0100 (CET) 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 B4A65836 for ; Fri, 25 Mar 2022 11:55:18 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B6DCE4495F for ; Fri, 25 Mar 2022 11:55:12 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Fri, 25 Mar 2022 11:55:05 +0100 Message-Id: <20220325105510.3262101-3-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220325105510.3262101-1-a.lauterer@proxmox.com> References: <20220325105510.3262101-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.024 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 librados2-perl 2/7] mon_command: optionally ignore errors 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: , X-List-Received-Date: Fri, 25 Mar 2022 10:55:49 -0000 In some situations we do not want to abort if the Ceph API returns an error. For example if we run the 'osd ok-to-stop' or similar calls, we are interested in the status message in the error case. Signed-off-by: Aaron Lauterer --- I split the adding of "noerr" into a separate patch for a clearly separated history PVE/RADOS.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PVE/RADOS.pm b/PVE/RADOS.pm index bec5028..36b42ed 100644 --- a/PVE/RADOS.pm +++ b/PVE/RADOS.pm @@ -259,7 +259,9 @@ sub cluster_stat { # example1: { prefix => 'get_command_descriptions'}) # example2: { prefix => 'mon dump', format => 'json' } sub mon_command { - my ($self, $cmd) = @_; + my ($self, $cmd, $noerr) = @_; + + $noerr = 0 if !$noerr; $cmd->{format} = 'json' if !$cmd->{format}; @@ -271,7 +273,7 @@ sub mon_command { my $raw = decode_json($ret); die "error with '$cmd->{prefix}': mon_command failed - $raw->{status_message}\n" - if $raw->{return_code} < 0; + if !$noerr && $raw->{return_code} < 0; my $data = ''; if ($cmd->{format} && $cmd->{format} eq 'json') { -- 2.30.2