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

Diskmanage: allow get_disks to take multiple disks

Browse Source 
we now expect the first parameter to be either a string with a single
disk, or an array ref with a list of disks

this way we can get the info of multiple disks simultaneously while
not iterating over all disks

this will be used to get the info for osd/db/wal disk

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2019-06-04 12:35:22 +02:00
committed by Thomas Lamprecht
parent 558d412d10
commit 52a064afcd
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
PVE/Diskmanage.pm
View File

@ -416,7 +416,7 @@ sub is_iscsi {
}
sub get_disks {
my ($disk, $nosmart) = @_;
my ($disks, $nosmart) = @_;
my $disklist = {};
my $mounted = {};
@ -440,14 +440,21 @@ sub get_disks {
my $lvmlist = get_lvm_devices();
# we get cciss/c0d0 but need cciss!c0d0
if (defined($disk) && $disk =~ m|^cciss/|) {
$disk =~ s|cciss/|cciss!|;
my $disk_regex = ".*";
if (defined($disks)) {
if (!ref($disks)) {
$disks = [ $disks ];
} elsif (ref($disks) ne 'ARRAY') {
die "disks is not a string or array reference\n";
}
# we get cciss/c0d0 but need cciss!c0d0
map { s|cciss/|cciss!| } @$disks;
$disk_regex = "(?:" . join('|', @$disks) . ")";
}
dir_glob_foreach('/sys/block', '.*', sub {
dir_glob_foreach('/sys/block', $disk_regex, sub {
my ($dev) = @_;
return if defined($disk) && $disk ne $dev;
# whitelisting following devices
# hdX: ide block device
# sdX: sd block device