'--no-degraded' flag in the first mdadm call inhibits the startup of array unless all expected drives are present. This will prevent starting arrays in degraded state. Second mdadm call (after LVM is scanned) will scan unused yet devices and make an attempt to run all found arrays even they are in degraded state. Two new tests are added. This fixes rhbz1527852. Here is boot-benchmark before and after patch (no performance issues): : libvirt backend : direct backend ------------------------------------------------ master : 835.2ms ±1.1ms : 670.4ms ±0.3ms master+patch : 837.7ms ±2.4ms : 671.8ms ±0.2ms --- appliance/init | 7 +- tests/md/Makefile.am | 2 + tests/md/test-lvm-on-md-device.sh | 84 ++++++++++++++++++++++ tests/md/test-md-and-lvm-devices.sh | 138 ++++++++++++++++++++++++++++++++++++ 4 files changed, 230 insertions(+), 1 deletion(-) create mode 100755 tests/md/test-lvm-on-md-device.sh create mode 100755 tests/md/test-md-and-lvm-devices.sh diff --git a/appliance/init b/appliance/init index c04ee45..4284be0 100755 --- a/appliance/init +++ b/appliance/init @@ -131,13 +131,17 @@ if test "$guestfs_network" = 1; then fi # Scan for MDs. -mdadm -As --auto=yes --run +# Inhibits the startup of array unless all expected drives are present. +mdadm -As --no-degraded # Scan for LVM. modprobe dm_mod ||: lvm vgchange -aay --sysinit +# Scan for MDs once again and finally run them. +mdadm -As --auto=yes --run + # Scan for Windows dynamic disks. ldmtool create all @@ -146,6 +150,7 @@ if test "$guestfs_verbose" = 1 && test "$guestfs_boot_analysis" != 1; then uname -a ls -lR /dev cat /proc/mounts + cat /proc/mdstat lvm pvs lvm vgs lvm lvs diff --git a/tests/md/Makefile.am b/tests/md/Makefile.am index 5e18dca..6a5f4d6 100644 --- a/tests/md/Makefile.am +++ b/tests/md/Makefile.am @@ -22,6 +22,8 @@ TESTS = \ test-inspect-fstab-md.sh \ test-list-filesystems.sh \ test-list-md-devices.sh \ + test-lvm-on-md-device.sh \ + test-md-and-lvm-devices.sh \ test-mdadm.sh TESTS_ENVIRONMENT = $(top_builddir)/run --test diff --git a/tests/md/test-lvm-on-md-device.sh b/tests/md/test-lvm-on-md-device.sh new file mode 100755 index 0000000..ab00f89 --- /dev/null +++ b/tests/md/test-lvm-on-md-device.sh @@ -0,0 +1,84 @@ +#!/bin/bash - +# libguestfs +# Copyright (C) 2011 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Test guestfish finds: +# 1. md device created from physical block device and LV(s), +# 2. md device created from LVs +# 3. VG created from md device(s) +# +# raid0 is used for md device because it is inoperable if one of its component is inaccessible. +# This covers rhbz1527852. + +set -e + +$TEST_FUNCTIONS +skip_if_skipped + +disk1=lvm-on-md-devices-1.img +disk2=lvm-on-md-devices-2.img + +rm -f $disk1 $disk2 + +# Clean up if the script is killed or exits early +cleanup () +{ + status=$? + set +e + + # Don't delete the output files if non-zero exit + if [ "$status" -eq 0 ]; then rm -f $disk1 $disk2; fi + + exit $status +} +trap cleanup INT QUIT TERM EXIT + +guestfish <<EOF +# Add 2 empty disks +sparse $disk1 100M +sparse $disk2 100M +run + +# Create a raid1 based on the 2 disks +md-create test "/dev/sda /dev/sdb" level:raid1 + +# Create volume group and logical volume on md device +pvcreate /dev/md127 +vgcreate vg0 /dev/md127 +lvcreate-free lv0 vg0 100 +EOF + +# Ensure list-md-devices now returns the newly created md device +output=$( +guestfish --format=raw -a $disk1 --format=raw -a $disk2 <<EOF +run +list-md-devices +lvs +EOF +) + +expected="/dev/md127 +/dev/vg0/lv0" + +if [ "$output" != "$expected" ]; then + echo "$0: error: actual output did not match expected output" + echo "$output" + exit 1 +fi + +# cleanup() is called implicitly which cleans up everything +exit 0 \ No newline at end of file diff --git a/tests/md/test-md-and-lvm-devices.sh b/tests/md/test-md-and-lvm-devices.sh new file mode 100755 index 0000000..46bed6d --- /dev/null +++ b/tests/md/test-md-and-lvm-devices.sh @@ -0,0 +1,138 @@ +#!/bin/bash - +# libguestfs +# Copyright (C) 2011 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Test guestfish finds: +# 1. md device created from physical block device and LV(s), +# 2. md device created from LVs +# 3. VG created from md device(s) +# +# raid0 is used for md device because it is inoperable if one of its component is inaccessible. +# This covers rhbz1527852. + +set -e + +$TEST_FUNCTIONS +skip_if_skipped + +disk1=md-and-lvm-devices-1.img +disk2=md-and-lvm-devices-2.img + +rm -f $disk1 $disk2 + +# Clean up if the script is killed or exits early +cleanup () +{ + status=$? + set +e + + # Don't delete the output files if non-zero exit + if [ "$status" -eq 0 ]; then rm -f $disk1 $disk2; fi + + exit $status +} +trap cleanup INT QUIT TERM EXIT + +# Create 2 disks partitioned as: +# sda1: 20M MD (md127) +# sda2: 20M PV (vg1) +# sda3: 20M MD (md125) +# +# sdb1: 20M PV (vg0) +# sdb2: 20M PV (vg2) +# sdb3: 20M MD (md125) +# +# lv0 : LV (vg0) +# lv1 : LV (vg1) +# lv2 : LV (vg2) +# md127 : md (sda1, lv0) +# md126 : md (lv1, lv2) +# md125 : md (sda3, sdb3) +# vg3 : VG (md125) +# lv3 : LV (vg3) + +guestfish <<EOF +# Add 2 empty disks +sparse $disk1 100M +sparse $disk2 100M +run + +# Partition disks +part-init /dev/sda mbr +part-add /dev/sda p 64 41023 +part-add /dev/sda p 41024 81983 +part-add /dev/sda p 81984 122943 +part-init /dev/sdb mbr +part-add /dev/sdb p 64 41023 +part-add /dev/sdb p 41024 81983 +part-add /dev/sdb p 81984 122943 + +# Create volume group and logical volume on sdb1 +pvcreate /dev/sdb1 +vgcreate vg0 /dev/sdb1 +lvcreate-free lv0 vg0 100 + +# Create md from sda1 and vg0/lv0 +md-create md-sda1-lv0 "/dev/sda1 /dev/vg0/lv0" level:raid0 + +# Create volume group and logical volume on sda2 +pvcreate /dev/sda2 +vgcreate vg1 /dev/sda2 +lvcreate-free lv1 vg1 100 + +# Create volume group and logical volume on sdb2 +pvcreate /dev/sdb2 +vgcreate vg2 /dev/sdb2 +lvcreate-free lv2 vg2 100 + +# Create md from vg1/lv1 and vg2/lv2 +md-create md-lv1-lv2 "/dev/vg1/lv1 /dev/vg2/lv2" level:raid0 + +# Create md from sda3 and sdb3 +md-create md-sda3-sdb3 "/dev/sda3 /dev/sdb3" level:raid0 + +# Create volume group and logical volume on md125 (last created md) +pvcreate /dev/md125 +vgcreate vg3 /dev/md125 +lvcreate-free lv3 vg3 100 +EOF + +# Ensure list-md-devices now returns the newly created md device +output=$( +guestfish --format=raw -a $disk1 --format=raw -a $disk2 <<EOF +run +list-md-devices +lvs +EOF +) + +expected="/dev/md125 +/dev/md126 +/dev/md127 +/dev/vg0/lv0 +/dev/vg1/lv1 +/dev/vg2/lv2 +/dev/vg3/lv3" + +if [ "$output" != "$expected" ]; then + echo "$0: error: actual output did not match expected output" + echo "$output" + exit 1 +fi + +# cleanup() is called implicitly which cleans up everything +exit 0 \ No newline at end of file -- 2.9.5