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

re-add hack for empty pool

Browse Source 
fresh created and empty rbd pool, throw a 500 error with "pool xxx doesn't contain rbd images" message.
This commit is contained in:
Dietmar Maurer
2012-07-18 06:04:09 +02:00
parent f7a1e35f69
commit 8c3abf126f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PVE/Storage/RBDPlugin.pm
View File

@ -32,7 +32,7 @@ sub rbd_ls {
my $list = {}; my $list = {};
run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => sub { my $parser = sub {
my $line = shift; my $line = shift;
if ($line =~ m/^(vm-(\d+)-\S+)$/) { if ($line =~ m/^(vm-(\d+)-\S+)$/) {
@ -44,7 +44,14 @@ sub rbd_ls {
vmid => $owner vmid => $owner
}; };
} }
}); };
eval {
run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
};
my $err = $@;
die $err if $err && $err !~ m/doesn't contain rbd images/ ;
return $list; return $list;
} }