proxmox-mirrors/librados2-perl
1
0
Fork 0
mirror of https://git.proxmox.com/git/librados2-perl synced 2025-11-02 16:25:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

create new mon_cmd method for new behavior with compat wrapper

Browse Source 
Rename the $noerr param to $no_result_catch while changing the method
name, as it was a bit confusing because we only ever adhere to it for
the actual command result, not other die's.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-11-17 14:23:50 +01:00
parent f9120f0235
commit 80deebd9c5
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/RADOS.pm
View File

@ -242,10 +242,8 @@ sub cluster_stat {
# example1: { prefix => 'get_command_descriptions'})
# example2: { prefix => 'mon dump', format => 'json' }
sub mon_command {
my ($self, $cmd, $noerr) = @_;
$noerr = 0 if !$noerr;
sub mon_cmd {
my ($self, $cmd, $no_result_catch) = @_;
$cmd->{format} = 'json' if !$cmd->{format};
@ -256,8 +254,8 @@ sub mon_command {
my $raw = decode_json($ret);
die "error with '$cmd->{prefix}': mon_command failed - $raw->{status_message}\n"
if !$noerr && $raw->{return_code} < 0;
die "error with '$cmd->{prefix}': mon_cmd failed - $raw->{status_message}\n"
if !$no_result_catch && $raw->{return_code} < 0;
my $data = '';
if ($cmd->{format} && $cmd->{format} eq 'json') {
@ -272,6 +270,14 @@ sub mon_command {
};
}
# for backward compatibillity or if one just doesn't care about actual RADOS error details
sub mon_command {
my ($self, $cmd) = @_;
my $res = mon_cmd($self, $cmd);
return $res->{data};
}
1;
__END__