diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2016-11-11 15:56:11 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2016-11-11 16:58:20 +0100 |
| commit | de3d054f7803bad12e395cb0bd099c0c9c396668 (patch) | |
| tree | 93a17a768639f3a23c86ed990351e0777c4a07bc | |
| parent | 4a2250f9cea300598fff8dbfee8700ac7aa81f89 (diff) | |
| download | lvm2-de3d054f7803bad12e395cb0bd099c0c9c396668.tar.gz | |
tests: avoid using polling
| -rw-r--r-- | test/shell/snapshot-merge-stack.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/shell/snapshot-merge-stack.sh b/test/shell/snapshot-merge-stack.sh index 6ed9c9524..3ee9eaa4e 100644 --- a/test/shell/snapshot-merge-stack.sh +++ b/test/shell/snapshot-merge-stack.sh @@ -40,13 +40,14 @@ snap_and_merge() { kill $SLEEP_PID aux delay_dev "$dev1" 0 200 $(get first_extent_sector "$dev1"): - lvchange --refresh $vg/$lv1 + lvchange --poll n --refresh $vg/$lv1 dmsetup table lvs -a -o+lv_merging,lv_merge_failed $vg sleep 1 check lv_attr_bit state $vg/$lv1 "a" check lv_attr_bit state $vg/$lv2 "a" aux error_dev "$dev2" $(get first_extent_sector "$dev2"): + aux enable_dev "$dev1" # delay to let snapshot merge 'discover' failing COW device sleep 1 sync @@ -56,7 +57,7 @@ snap_and_merge() { check lv_attr_bit state $vg/$lv2 "m" # device OK and running in full speed - aux enable_dev "$dev1" "$dev2" + aux enable_dev "$dev2" # reactivate so merge can finish lvchange -an $vg |