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

get_monaddr_list: also ensure that returned 'mon addr' are defined

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2019-01-09 15:23:39 +01:00
parent 187df8553e
commit 4b3088a0a8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
PVE/CephConfig.pm
View File

@ -99,17 +99,16 @@ my $ceph_get_key = sub {
sub get_monaddr_list { sub get_monaddr_list {
my ($configfile) = shift; my ($configfile) = shift;
my $server;
if (!defined($configfile)) { if (!defined($configfile)) {
warn "No ceph config specified\n"; warn "No ceph config specified\n";
return; return;
} }
my $config = $parse_ceph_file->($configfile); my $config = $parse_ceph_file->($configfile);
@$server = sort map { $config->{$_}->{'mon addr'} } grep {/mon\./} %{$config};
return join(',', @$server); my @monids = grep { /mon\./ && defined($config->{$_}->{'mon addr'}) } %{$config};
return join(',', sort map { $config->{$_}->{'mon addr'} } @monids);
}; };
sub hostlist { sub hostlist {