proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-07 02:23:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #936: ceph: support multiple roots in osd tree

Browse Source 
The OSD tree in our GUI otherwise only shows the "first"
root it finds in the crush map.
This commit is contained in:
Wolfgang Bumiller 2016-04-12 09:56:04 +02:00 committed by Dietmar Maurer
parent eca5c8b1dc
commit 4aed5e3e3a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/API2/Ceph.pm
View File

@ -138,17 +138,16 @@ __PACKAGE__->register_method ({
} }
} }
my $rootnode; my $roots = [];
foreach my $e (@{$res->{nodes}}) { foreach my $e (@{$res->{nodes}}) {
if (!$nodes->{$e->{id}}->{parent}) { if (!$nodes->{$e->{id}}->{parent}) {
$rootnode = $newnodes->{$e->{id}}; push @$roots, $newnodes->{$e->{id}};
last;
} }
} }
die "no root node\n" if !$rootnode; die "no root node\n" if !@$roots;
my $data = { root => $rootnode }; my $data = { root => { leaf => 0, children => $roots } };
return $data; return $data;
}}); }});

2
debian/changelog.Debian vendored
View File

@ -7,6 +7,8 @@ pve-manager (4.1-27) unstable; urgency=medium
* qemu monitor GUI: support page up/down * qemu monitor GUI: support page up/down
* Fix #936: ceph: support multiple roots in osd tree
-- Proxmox Support Team <support@proxmox.com> Tue, 12 Apr 2016 17:12:09 +0200 -- Proxmox Support Team <support@proxmox.com> Tue, 12 Apr 2016 17:12:09 +0200
pve-manager (4.1-26) unstable; urgency=medium pve-manager (4.1-26) unstable; urgency=medium