diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2015-05-01 22:42:10 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-05-01 22:49:38 +0200 |
| commit | 3542fce0fba91b71792d5dabcbe96637f19de3fc (patch) | |
| tree | 8714c6aa83193ea2002b1369fd591b651b208102 | |
| parent | abdfb1e75ba372072919ddad0f43f8806412d531 (diff) | |
| download | lvm2-3542fce0fba91b71792d5dabcbe96637f19de3fc.tar.gz | |
tests: more advance cleanup of running pvmove
More take down more targets and use time-limited code.
| -rw-r--r-- | test/shell/pvmove-restart.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/test/shell/pvmove-restart.sh b/test/shell/pvmove-restart.sh index 1496b359d..011e6ee73 100644 --- a/test/shell/pvmove-restart.sh +++ b/test/shell/pvmove-restart.sh @@ -43,10 +43,17 @@ wait # Simulate reboot - forcibly remove related devices # First take down $lv1 then it's pvmove0 -while dmsetup status "$vg-$lv1"; do dmsetup remove "$vg-$lv1" || true; done -while dmsetup status "$vg-pvmove0"; do dmsetup remove "$vg-pvmove0" || true; done -while dmsetup status "$vg-pvmove0_mimage_1"; do dmsetup remove "$vg-pvmove0_mimage_1" || true; done -dmsetup table +j=0 +for i in $lv1 pvmove0 pvmove0_mimage_1 pvmove0_mimage_0 ; do + while dmsetup status "$vg-$i"; do + dmsetup remove "$vg-$i" || { + j=$(($j + 1)) + test $j -le 100 || die "Cannot take down devices." + sleep .1; + } + done +done +dmsetup table | grep $PREFIX # Check we really have pvmove volume check lv_attr_bit type $vg/pvmove0 "p" |