|
 |
2d7ffa |
From 15384bcedb8002440e1327e97cd9c139af8a32dd Mon Sep 17 00:00:00 2001
|
|
|
2d7ffa |
From: Harald Hoyer <harald@redhat.com>
|
|
|
2d7ffa |
Date: Mon, 15 Jan 2018 15:44:46 +0100
|
|
|
2d7ffa |
Subject: [PATCH] dracut-functions.sh:check_vol_slaves() speedup LV -> VG name
|
|
|
2d7ffa |
|
|
|
2d7ffa |
Instead of trying all /dev/mapper/* devices to match the maj:min, and
|
|
|
2d7ffa |
get the VG name with "lvm lvs", use the dm/name from /sys and dmsetup
|
|
|
2d7ffa |
splitname.
|
|
|
2d7ffa |
|
|
|
2d7ffa |
This should speedup execution with lots of LVs.
|
|
|
2d7ffa |
|
|
|
2d7ffa |
Cherry-picked from: 9ed6eb741
|
|
|
2d7ffa |
Resolves: #1531503
|
|
|
2d7ffa |
---
|
|
|
49e6a8 |
dracut-functions.sh | 62 +++++++++++++++++++++------------------------
|
|
|
2d7ffa |
1 file changed, 29 insertions(+), 33 deletions(-)
|
|
|
2d7ffa |
|
|
|
2d7ffa |
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
|
|
2d7ffa |
index ca54bd7f..53289ca0 100755
|
|
|
2d7ffa |
--- a/dracut-functions.sh
|
|
|
2d7ffa |
+++ b/dracut-functions.sh
|
|
|
2d7ffa |
@@ -687,43 +687,39 @@ for_each_host_dev_and_slaves()
|
|
|
2d7ffa |
# but you cannot create the logical volume without the volume group.
|
|
|
2d7ffa |
# And the volume group might be bigger than the devices the LV needs.
|
|
|
2d7ffa |
check_vol_slaves() {
|
|
|
2d7ffa |
- local _lv _vg _pv
|
|
|
2d7ffa |
- for i in /dev/mapper/*; do
|
|
|
2d7ffa |
- [[ $i == /dev/mapper/control ]] && continue
|
|
|
2d7ffa |
- _lv=$(get_maj_min $i)
|
|
|
2d7ffa |
- if [[ $_lv = $2 ]]; then
|
|
|
2d7ffa |
- _vg=$(lvm lvs --noheadings -o vg_name $i 2>/dev/null)
|
|
|
2d7ffa |
- # strip space
|
|
|
2d7ffa |
- _vg="${_vg//[[:space:]]/}"
|
|
|
2d7ffa |
- if [[ $_vg ]]; then
|
|
|
2d7ffa |
- for _pv in $(lvm vgs --noheadings -o pv_name "$_vg" 2>/dev/null)
|
|
|
2d7ffa |
- do
|
|
|
2d7ffa |
- check_block_and_slaves $1 $(get_maj_min $_pv) && return 0
|
|
|
2d7ffa |
- done
|
|
|
2d7ffa |
- fi
|
|
|
2d7ffa |
- fi
|
|
|
2d7ffa |
- done
|
|
|
2d7ffa |
+ local _lv _vg _pv _dm _majmin
|
|
|
2d7ffa |
+ _majmin="$2"
|
|
|
2d7ffa |
+ _lv="/dev/block/$_majmin"
|
|
|
2d7ffa |
+ _dm=/sys/dev/block/$_majmin/dm
|
|
|
2d7ffa |
+ [[ -f $_dm/uuid && $(<$_dm/uuid) =~ LVM-* ]] || return 1
|
|
|
2d7ffa |
+ _vg=$(dmsetup splitname --noheadings -o vg_name $(<"$_dm/name") )
|
|
|
2d7ffa |
+ # strip space
|
|
|
2d7ffa |
+ _vg="${_vg//[[:space:]]/}"
|
|
|
2d7ffa |
+ if [[ $_vg ]]; then
|
|
|
2d7ffa |
+ for _pv in $(lvm vgs --noheadings -o pv_name "$_vg" 2>/dev/null)
|
|
|
2d7ffa |
+ do
|
|
|
2d7ffa |
+ check_block_and_slaves $1 $(get_maj_min $_pv) && return 0
|
|
|
2d7ffa |
+ done
|
|
|
2d7ffa |
+ fi
|
|
|
2d7ffa |
return 1
|
|
|
2d7ffa |
}
|
|
|
2d7ffa |
|
|
|
2d7ffa |
check_vol_slaves_all() {
|
|
|
2d7ffa |
- local _lv _vg _pv
|
|
|
2d7ffa |
- for i in /dev/mapper/*; do
|
|
|
2d7ffa |
- [[ $i == /dev/mapper/control ]] && continue
|
|
|
2d7ffa |
- _lv=$(get_maj_min $i)
|
|
|
2d7ffa |
- if [[ $_lv = $2 ]]; then
|
|
|
2d7ffa |
- _vg=$(lvm lvs --noheadings -o vg_name $i 2>/dev/null)
|
|
|
2d7ffa |
- # strip space
|
|
|
2d7ffa |
- _vg="${_vg//[[:space:]]/}"
|
|
|
2d7ffa |
- if [[ $_vg ]]; then
|
|
|
2d7ffa |
- for _pv in $(lvm vgs --noheadings -o pv_name "$_vg" 2>/dev/null)
|
|
|
2d7ffa |
- do
|
|
|
2d7ffa |
- check_block_and_slaves_all $1 $(get_maj_min $_pv)
|
|
|
2d7ffa |
- done
|
|
|
2d7ffa |
- return 0
|
|
|
2d7ffa |
- fi
|
|
|
2d7ffa |
- fi
|
|
|
2d7ffa |
- done
|
|
|
2d7ffa |
+ local _lv _vg _pv _majmin
|
|
|
2d7ffa |
+ _majmin="$2"
|
|
|
2d7ffa |
+ _lv="/dev/block/$_majmin"
|
|
|
2d7ffa |
+ _dm="/sys/dev/block/$_majmin/dm"
|
|
|
2d7ffa |
+ [[ -f $_dm/uuid && $(<$_dm/uuid) =~ LVM-* ]] || return 1
|
|
|
2d7ffa |
+ _vg=$(dmsetup splitname --noheadings -o vg_name $(<"$_dm/name") )
|
|
|
2d7ffa |
+ # strip space
|
|
|
2d7ffa |
+ _vg="${_vg//[[:space:]]/}"
|
|
|
2d7ffa |
+ if [[ $_vg ]]; then
|
|
|
2d7ffa |
+ for _pv in $(lvm vgs --noheadings -o pv_name "$_vg" 2>/dev/null)
|
|
|
2d7ffa |
+ do
|
|
|
2d7ffa |
+ check_block_and_slaves_all $1 $(get_maj_min $_pv)
|
|
|
2d7ffa |
+ done
|
|
|
2d7ffa |
+ return 0
|
|
|
2d7ffa |
+ fi
|
|
|
2d7ffa |
return 1
|
|
|
2d7ffa |
}
|
|
|
2d7ffa |
|