diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2017-06-12 15:09:10 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2017-06-12 16:35:22 +0000 |
| commit | 05b2fbd077cadc409994762e346ef94f4904545b (patch) | |
| tree | de1448e162490d70a59085dee20809edef71fcd3 /tests | |
| parent | e97c32ee9913969a726f8a8286cf714f907729d6 (diff) | |
ec: fix ec-data-heal.t failure
With brick mux enabled, this test was constantly failing. Further it was
found that the the test does a series of killing a particular brick and
bringing it up in cmdline where as just starting the volume with force
would suffice.
Change-Id: Iee491d0777eaa28dca5c78f92d4b400fcc897fd2
BUG: 1460638
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Signed-off-by: Ashish Pandey <aspandey@redhat.com>
Reviewed-on: https://review.gluster.org/17508
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/basic/ec/ec-data-heal.t | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/tests/basic/ec/ec-data-heal.t b/tests/basic/ec/ec-data-heal.t index 4599c8a336b..2672661c6b1 100755 --- a/tests/basic/ec/ec-data-heal.t +++ b/tests/basic/ec/ec-data-heal.t @@ -22,14 +22,11 @@ iopid=$(echo $!) ############ Kill and start brick0 for heal ########### -brick0=$(ps -p $(get_brick_pid $V0 $H0 $B0/${V0}0) -o args) -WORDTOREMOVE=COMMAND -brick0=${brick0//$WORDTOREMOVE/} TEST kill_brick $V0 $H0 $B0/${V0}0 EXPECT_WITHIN $CHILD_UP_TIMEOUT "2" ec_child_up_count $V0 0 #sleep so that data can be written which will be healed later sleep 10 -TEST eval $brick0 +TEST $CLI volume start $V0 force ##wait for heal info to become 0 and kill IO EXPECT_WITHIN $IO_HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 kill $iopid @@ -39,44 +36,35 @@ EXPECT_WITHIN $IO_HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 ## unmount and mount get md5sum after killing brick0 -brick0=$(ps -p $(get_brick_pid $V0 $H0 $B0/${V0}0) -o args) -WORDTOREMOVE=COMMAND -brick0=${brick0//$WORDTOREMOVE/} TEST kill_brick $V0 $H0 $B0/${V0}0 EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0; EXPECT_WITHIN $CHILD_UP_TIMEOUT "2" ec_child_up_count $V0 0 mdsum0=`md5sum $M0/file | awk '{print $1}'` -TEST eval $brick0 +TEST $CLI volume start $V0 force EXPECT_WITHIN $CHILD_UP_TIMEOUT "3" ec_child_up_count $V0 0 ## unmount and mount get md5sum after killing brick1 -brick1=$(ps -p $(get_brick_pid $V0 $H0 $B0/${V0}1) -o args) -WORDTOREMOVE=COMMAND -brick1=${brick1//$WORDTOREMOVE/} TEST kill_brick $V0 $H0 $B0/${V0}1 EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0; EXPECT_WITHIN $CHILD_UP_TIMEOUT "2" ec_child_up_count $V0 0 mdsum1=`md5sum $M0/file | awk '{print $1}'` -TEST eval $brick1 +TEST $CLI volume start $V0 force EXPECT_WITHIN $CHILD_UP_TIMEOUT "3" ec_child_up_count $V0 0 ## unmount and mount get md5sum after killing brick2 -brick2=$(ps -p $(get_brick_pid $V0 $H0 $B0/${V0}2) -o args) -WORDTOREMOVE=COMMAND -brick2=${brick2//$WORDTOREMOVE/} TEST kill_brick $V0 $H0 $B0/${V0}2 EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0; EXPECT_WITHIN $CHILD_UP_TIMEOUT "2" ec_child_up_count $V0 0 mdsum2=`md5sum $M0/file | awk '{print $1}'` -TEST eval $brick2 +TEST $CLI volume start $V0 force EXPECT_WITHIN $CHILD_UP_TIMEOUT "3" ec_child_up_count $V0 0 # compare all the three md5sums |