diff options
Diffstat (limited to 'test/shell/integrity-large.sh')
| -rw-r--r-- | test/shell/integrity-large.sh | 43 |
1 files changed, 6 insertions, 37 deletions
diff --git a/test/shell/integrity-large.sh b/test/shell/integrity-large.sh index 16e28fb9d..68822e3ef 100644 --- a/test/shell/integrity-large.sh +++ b/test/shell/integrity-large.sh @@ -92,37 +92,6 @@ _verify_data_on_lv() { umount $mnt } -_sync_percent() { - local checklv=$1 - get lv_field "$checklv" sync_percent | cut -d. -f1 -} - -_wait_recalc() { - local checklv=$1 - - for i in $(seq 1 20) ; do - sync=$(_sync_percent "$checklv") - echo "sync_percent is $sync" - - if test "$sync" = "100"; then - return - fi - - sleep 1 - done - - # TODO: There is some strange bug, first leg of RAID with integrity - # enabled never gets in sync. I saw this in BB, but not when executing - # the commands manually - if test -z "$sync"; then - echo "TEST\ WARNING: Resync of dm-integrity device '$checklv' failed" - dmsetup status "$DM_DEV_DIR/mapper/${checklv/\//-}" - exit - fi - echo "timeout waiting for recalc" - return 1 -} - # lvextend to 512MB is needed for the imeta LV to # be extended from 4MB to 8MB. @@ -135,8 +104,8 @@ _add_data_to_lv lvchange -an $vg/$lv1 lvconvert --raidintegrity y $vg/$lv1 lvchange -ay $vg/$lv1 -_wait_recalc $vg/${lv1}_rimage_0 -_wait_recalc $vg/${lv1}_rimage_1 +aux wait_recalc $vg/${lv1}_rimage_0 +aux wait_recalc $vg/${lv1}_rimage_1 lvs -a -o+devices $vg _verify_data_on_lv lvchange -an $vg/$lv1 @@ -144,8 +113,8 @@ lvextend -L 512M $vg/$lv1 lvs -a -o+devices $vg lvchange -ay $vg/$lv1 _verify_data_on_lv -_wait_recalc $vg/${lv1}_rimage_0 -_wait_recalc $vg/${lv1}_rimage_1 +aux wait_recalc $vg/${lv1}_rimage_0 +aux wait_recalc $vg/${lv1}_rimage_1 lvs -a -o+devices $vg check lv_field $vg/${lv1}_rimage_0_imeta size "12.00m" check lv_field $vg/${lv1}_rimage_1_imeta size "12.00m" @@ -166,8 +135,8 @@ lvs -a -o+devices $vg # adding integrity again will allocate new 12MB imeta LVs # on dev3,dev4 lvconvert --raidintegrity y $vg/$lv1 -_wait_recalc $vg/${lv1}_rimage_0 -_wait_recalc $vg/${lv1}_rimage_1 +aux wait_recalc $vg/${lv1}_rimage_0 +aux wait_recalc $vg/${lv1}_rimage_1 lvs -a -o+devices $vg check lv_field $vg/${lv1}_rimage_0_imeta size "20.00m" check lv_field $vg/${lv1}_rimage_1_imeta size "20.00m" |