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

rbd : rbd_ls: doesn't throw error if pool doesn't contain image

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier
2012-06-17 08:15:45 +02:00
committed by Dietmar Maurer
parent 4f4f94801d
commit 3e195ccccb
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
PVE/Storage/RBDPlugin.pm
View File

@ -19,19 +19,29 @@ sub rbd_ls{
my $cmd = ['/usr/bin/rbd', '-p', $rbdpool, '-m', $monhost, '-n', "client.".$scfg->{username} ,'--keyfile', '/etc/pve/priv/ceph/'.$storeid.'.'.$scfg->{username}.'.key', '--auth_supported',$scfg->{authsupported}, 'ls' ]; my $cmd = ['/usr/bin/rbd', '-p', $rbdpool, '-m', $monhost, '-n', "client.".$scfg->{username} ,'--keyfile', '/etc/pve/priv/ceph/'.$storeid.'.'.$scfg->{username}.'.key', '--auth_supported',$scfg->{authsupported}, 'ls' ];
my $list = {}; my $list = {};
run_command($cmd, errfunc => sub {},outfunc => sub {
my $errfunc = sub {
my $line = shift; my $line = shift;
die $line if $line;
};
$line = trim($line); eval {
my ($image) = $line; run_command($cmd, errmsg => "rbd error", errfunc => $errfunc,outfunc => sub {
my $line = shift;
$list->{$rbdpool}->{$image} = { $line = trim($line);
name => $image, my ($image) = $line;
size => "",
};
}); $list->{$rbdpool}->{$image} = {
name => $image,
size => "",
};
});
};
my $err = $@;
die $err if $err && $err !~ m/doesn't contain rbd images/ ;
return $list; return $list;