yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rdb: followup cleanups

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2018-09-06 15:19:16 +02:00
parent c093e93b28
commit 1be93fe2fd
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
PVE/Storage/RBDPlugin.pm
View File

@ -157,10 +157,7 @@ sub rbd_ls {
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $raw = '';
my $parser = sub {
$raw .= shift;
};
my $parser = sub { $raw .= shift };
eval {
run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
@ -197,29 +194,21 @@ sub rbd_volume_info {
my $cmd = undef;
my @options = ('info', $volname, '--format', 'json');
if($snap){
if ($snap) {
push @options, '--snap', $snap;
}
$cmd = &$rbd_cmd($scfg, $storeid, @options);
my $size = undef;
my $parent = undef;
my $format = undef;
my $protected = undef;
my $features = undef;
my $raw = '';
my $parser = sub {
$raw .= shift;
};
my $parser = sub { $raw .= shift };
run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
my $volume = $raw ne '' ? JSON::decode_json($raw) : {};
$volume->{parent} = $get_parent_image_name->($volume->{parent});
if (defined($volume->{protected})) {
$volume->{protected} = $volume->{protected} eq "true" ? 1 : undef;
}
$volume->{protected} = defined($volume->{protected}) && $volume->{protected} eq "true" ? 1 : undef;
return $volume->@{qw(size parent format protected features)};
}