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 1CB7769CEC for ; Fri, 25 Mar 2022 11:55:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 144B89D4 for ; Fri, 25 Mar 2022 11:55:22 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 017A0899 for ; Fri, 25 Mar 2022 11:55:19 +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 AC1E446F9B for ; Fri, 25 Mar 2022 11:55:13 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Fri, 25 Mar 2022 11:55:04 +0100 Message-Id: <20220325105510.3262101-2-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 1/7] mon_command: refactor to pass all data to perl 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:52 -0000 By passing back all return values from the Ceph API (RADOS.xs) to Perl we are more flexible to make more than just the data available further up the stack. These values are: * return code * status message (can contain useful information) * data The Ceph API interaction happens in a child process. We need to en- and decode the returned hash in JSON to pass it between the child and parent process. RADOS.pm::mon_command now returns not just the data, but all information as a hash ref. Therefore dependent packages (pve-manager, pve-storage) need to adapt. Signed-off-by: Aaron Lauterer --- Make sure to coordinate breaking changes and releases of affected packages: storager, manager Patches 3 and 4 in this series contain the needed changes for these packages changes: * simplify changes by always returning has href from RADOS.xs and handle errors in the Perl side (RADOS.pm). * always return hash ref from RADOS.pm::mon_command() PVE/RADOS.pm | 20 ++++++++++++++++---- RADOS.xs | 18 ++++++------------ 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/PVE/RADOS.pm b/PVE/RADOS.pm index 463abc7..bec5028 100644 --- a/PVE/RADOS.pm +++ b/PVE/RADOS.pm @@ -201,7 +201,7 @@ sub new { my $res; eval { if ($cmd eq 'M') { # rados monitor commands - $res = pve_rados_mon_command($self->{conn}, [ $data ]); + $res = encode_json(pve_rados_mon_command($self->{conn}, [ $data ])); } elsif ($cmd eq 'C') { # class methods my $aref = decode_json($data); my $method = shift @$aref; @@ -265,13 +265,25 @@ sub mon_command { my $json = encode_json($cmd); - my $raw = eval { $sendcmd->($self, 'M', $json) }; + my $ret = $sendcmd->($self, 'M', $json); die "error with '$cmd->{prefix}': $@" if $@; + my $raw = decode_json($ret); + + die "error with '$cmd->{prefix}': mon_command failed - $raw->{status_message}\n" + if $raw->{return_code} < 0; + + my $data = ''; if ($cmd->{format} && $cmd->{format} eq 'json') { - return length($raw) ? decode_json($raw) : undef; + $data = length($raw->{data}) ? decode_json($raw->{data}) : undef; + } else { + $data = $raw->{data}; } - return $raw; + return { + return_code => $raw->{return_code}, + status_message => $raw->{status_message}, + data => $data, + }; } diff --git a/RADOS.xs b/RADOS.xs index 9afba1c..45f634c 100644 --- a/RADOS.xs +++ b/RADOS.xs @@ -98,7 +98,7 @@ CODE: rados_shutdown(cluster); } -SV * +HV * pve_rados_mon_command(cluster, cmds) rados_t cluster AV *cmds @@ -136,18 +136,12 @@ CODE: &outslen ); - if (ret < 0) { - char msg[4096]; - if (outslen > sizeof(msg)) { - outslen = sizeof(msg); - } - snprintf(msg, sizeof(msg), "mon_command failed - %.*s\n", (int)outslen, outs); - rados_buffer_free(outs); - rados_buffer_free(outbuf); - die(msg); - } + HV * rh = (HV *)sv_2mortal((SV *)newHV()); - RETVAL = newSVpv(outbuf, outbuflen); + (void)hv_store(rh, "return_code", 11, newSViv(ret), 0); + (void)hv_store(rh, "status_message", 14, newSVpv(outs, outslen), 0); + (void)hv_store(rh, "data", 4, newSVpv(outbuf, outbuflen), 0); + RETVAL = rh; rados_buffer_free(outbuf); rados_buffer_free(outs); -- 2.30.2