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

avoid call to lvs when deactivating devices

Browse Source 
Because this can be slow if there are many devices.
This commit is contained in:
Dietmar Maurer
2012-04-23 06:31:04 +02:00
parent 75d75990b4
commit 5c009b733e
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/Storage.pm
View File

@ -1981,8 +1981,6 @@ sub deactivate_volumes {
return if !($vollist && scalar(@$vollist)); return if !($vollist && scalar(@$vollist));
my $lvs = lvm_lvs ();
my @errlist = (); my @errlist = ();
foreach my $volid (@$vollist) { foreach my $volid (@$vollist) {
my ($storeid, $volname) = parse_volume_id ($volid); my ($storeid, $volname) = parse_volume_id ($volid);
@ -1990,10 +1988,9 @@ sub deactivate_volumes {
my $scfg = storage_config ($cfg, $storeid); my $scfg = storage_config ($cfg, $storeid);
if ($scfg->{type} eq 'lvm') { if ($scfg->{type} eq 'lvm') {
my ($name) = parse_volname_lvm ($volname);
if ($lvs->{$scfg->{vgname}}->{$name}) {
my $path = path ($cfg, $volid); my $path = path ($cfg, $volid);
next if ! -b $path;
my $cmd = ['/sbin/lvchange', '-aln', $path]; my $cmd = ['/sbin/lvchange', '-aln', $path];
eval { run_command($cmd, errmsg => "can't deactivate LV '$volid'"); }; eval { run_command($cmd, errmsg => "can't deactivate LV '$volid'"); };
if (my $err = $@) { if (my $err = $@) {
@ -2002,7 +1999,6 @@ sub deactivate_volumes {
} }
} }
} }
}
die "volume deativation failed: " . join(' ', @errlist) die "volume deativation failed: " . join(' ', @errlist)
if scalar(@errlist); if scalar(@errlist);