diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-03-27 22:33:37 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-03-27 23:19:08 +0100 |
| commit | 5ec7992e29fdf3273673f712d6a9f231903b6bf2 (patch) | |
| tree | 9b907ad70dadc24c2a236fea357034d0d248b942 | |
| parent | feb7fef6c8d22d5773b6a5d1d9f2a5a3f52b5b3b (diff) | |
| download | lvm2-5ec7992e29fdf3273673f712d6a9f231903b6bf2.tar.gz | |
tests: reoder killing order
We need to stop pvmove while still in progress,
so restart lvmpolld after pvmoving devices are gone
| -rw-r--r-- | test/shell/pvmove-resume-multiseg.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/shell/pvmove-resume-multiseg.sh b/test/shell/pvmove-resume-multiseg.sh index 1263d81ed..cdb426b66 100644 --- a/test/shell/pvmove-resume-multiseg.sh +++ b/test/shell/pvmove-resume-multiseg.sh @@ -20,7 +20,7 @@ SKIP_WITH_LVMLOCKD=1 . lib/inittest aux prepare_pvs 5 40 -aux throttle_dm_mirror 40 || : +aux throttle_dm_mirror 60 || : vgcreate -s 128k $vg "$dev1" "$dev2" "$dev3" pvcreate --metadatacopies 0 "$dev4" "$dev5" @@ -48,17 +48,17 @@ test_pvmove_resume() { aux wait_pvmove_lv_ready "$vg-pvmove1" 300 kill -9 $PVMOVE + while dmsetup status "$vg-$lv1"; do dmsetup remove "$vg-$lv1" || true; done + while dmsetup status "$vg-$lv2"; do dmsetup remove "$vg-$lv2" || true; done + while dmsetup status "$vg-pvmove0"; do dmsetup remove "$vg-pvmove0" || true; done + while dmsetup status "$vg-pvmove1"; do dmsetup remove "$vg-pvmove1" || true; done + if test -e LOCAL_LVMPOLLD ; then aux prepare_lvmpolld fi wait - while dmsetup status "$vg-$lv1"; do dmsetup remove "$vg-$lv1" || true; done - while dmsetup status "$vg-$lv2"; do dmsetup remove "$vg-$lv2" || true; done - while dmsetup status "$vg-pvmove0"; do dmsetup remove "$vg-pvmove0" || true; done - while dmsetup status "$vg-pvmove1"; do dmsetup remove "$vg-pvmove1" || true; done - check lv_attr_bit type $vg/pvmove0 "p" check lv_attr_bit type $vg/pvmove1 "p" |