michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show real PVs for raid LVs

Browse Source
This commit is contained in:
Jamie Cameron
2022-07-05 13:38:37 -07:00
parent 29c036da6e
commit f3be18aa28
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lvm/lvm-lib.pl
View File

@@ -391,9 +391,10 @@ sub get_logical_volume_usage
{
local ($lv) = @_;
local @rv;
local @raids;
if (&get_lvm_version() >= 2) {
# LVdisplay has new format in version 2
open(DISPLAY, "lvdisplay -m ".quotemeta($lv->{'device'})." 2>/dev/null |");
open(DISPLAY, "lvdisplay -a -m ".quotemeta($lv->{'device'})." 2>/dev/null |");
while(<DISPLAY>) {
if (/\s+Physical\s+volume\s+\/dev\/(\S+)/) {
push(@rv, [ $1, undef ]);
@@ -401,8 +402,21 @@ if (&get_lvm_version() >= 2) {
elsif (/\s+Physical\s+extents\s+(\d+)\s+to\s+(\d+)/ && @rv) {
$rv[$#rv]->[1] = $2-$1+1;
}
elsif (/\s+Logical\s+volume\s+([a-z0-9\_]+)/i) {
push(@raids, [ $1, undef ]);
}
elsif (/\s+Logical\s+extents\s+(\d+)\s+to\s+(\d+)/ && @rv) {
$raids[$#raid]->[1] = $2-$1+1;
}
}
close(DISPLAY);
# Lookup actual PVs for raid logical volumes
foreach my $r (@raids) {
my $rlv = { 'device' => '/dev/'.$lv->{'vg'}.'/'.$r->[0] };
my @pvs = &get_logical_volume_usage($rlv);
push(@rv, @pvs);
}
}
else {
# Old version 1 format