diff options
Diffstat (limited to 'tests/basic/afr/resolve.t')
| -rw-r--r-- | tests/basic/afr/resolve.t | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/basic/afr/resolve.t b/tests/basic/afr/resolve.t index 7dd432996f6..a741eee6e5e 100644 --- a/tests/basic/afr/resolve.t +++ b/tests/basic/afr/resolve.t @@ -12,8 +12,8 @@ TEST pidof glusterd TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1} TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume start $V0 -TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 -TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M1 +TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0; +TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M1; TEST cd $M0 TEST mkdir -p a/b/c/d/e TEST cd a/b/c/d/e @@ -23,8 +23,12 @@ echo abc > g TEST kill_brick $V0 $H0 $B0/${V0}0 rm -rf $B0/${V0}0/.glusterfs $B0/${V0}0/a +#Ideally, disk replacement is done using reset-brick or replace-brick gluster CLI +#which will create .glusterfs folder. +mkdir $B0/${V0}0/.glusterfs && chmod 600 $B0/${V0}0/.glusterfs + TEST $CLI volume start $V0 force -EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0 +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_meta $M0 $V0-replicate-0 0 #Test that the lookup returns ENOENT instead of ESTALE #If lookup returns ESTALE this command will fail with ESTALE TEST touch f @@ -44,6 +48,8 @@ echo jkl > $M1/b #gfid-mismatch happened. This should result in EIO TEST setfattr -x trusted.afr.$V0-client-0 $B0/${V0}1 TEST $CLI volume start $V0 force -EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0 -TEST ! cat $M0/b +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_meta $M0 $V0-replicate-0 0 +# The kernel knows nothing about the tricks done to the volume, and the file +# may still be in page cache. Wait for timeout. +EXPECT_WITHIN 10 "^$" cat $M0/b cleanup |