diff options
Diffstat (limited to 'tests/bitrot/bug-1373520.t')
| -rw-r--r-- | tests/bitrot/bug-1373520.t | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/tests/bitrot/bug-1373520.t b/tests/bitrot/bug-1373520.t index 5e69ab78fe9..271bb3de287 100644 --- a/tests/bitrot/bug-1373520.t +++ b/tests/bitrot/bug-1373520.t @@ -17,7 +17,7 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Started' volinfo_field $V0 'Status' TEST $CLI volume set $V0 performance.stat-prefetch off #Mount the volume -TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0 +TEST $GFS -s $H0 --volfile-id $V0 $M0 EXPECT_WITHIN $CHILD_UP_TIMEOUT "6" ec_child_up_count $V0 0 #Enable bitrot @@ -46,19 +46,39 @@ TEST $CLI volume start $V0 EXPECT_WITHIN $CHILD_UP_TIMEOUT "6" ec_child_up_count $V0 0 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" get_bitd_count -#Trigger lookup so that bitrot xlator marks file as bad in its inode context. -TEST stat $M0/FILE1 - #Delete file and all links from backend -TEST stat $B0/${V0}5/FILE1 -TEST `ls -li $B0/${V0}5/FILE1 | awk '{print $1}' | xargs find $B0/${V0}5/ -inum | xargs -r rm -rf` +TEST rm -rf $(find $B0/${V0}5 -inum $(stat -c %i $B0/${V0}5/FILE1)) + +# The test for each file below used to look like this: +# +# TEST stat $M0/FILE1 +# EXPECT_WITHIN $HEAL_TIMEOUT "$SIZE" stat $B0/${V0}5/FILE1 +# +# That didn't really work, because EXPECT_WITHIN would bail immediately if +# 'stat' returned an error - which it would if the file wasn't there yet. +# Since changing this, I usually see at least a few retries, and sometimes more +# than twenty, before the check for HL_FILE1 succeeds. The 'ls' is also +# necessary, to force a name heal as well as data. With both that and the +# 'stat' on $M0 being done here for every retry, there's no longer any need to +# have them elsewhere. +# +# If we had EW_RETRIES support (https://review.gluster.org/#/c/16451/) we could +# use it here to see how many retries are typical on the machines we use for +# regression, and set an appropriate upper bound. As of right now, though, +# that support does not exist yet. +ugly_stat () { + local client_dir=$1 + local brick_dir=$2 + local bare_file=$3 + + ls $client_dir + stat -c %s $client_dir/$bare_file + stat -c %s $brick_dir/$bare_file 2> /dev/null || echo "UNKNOWN" +} #Access files -TEST cat $M0/FILE1 -EXPECT_WITHIN $HEAL_TIMEOUT "$SIZE" stat -c %s $B0/${V0}5/FILE1 - -TEST cat $M0/HL_FILE1 -EXPECT_WITHIN $HEAL_TIMEOUT "$SIZE" stat -c %s $B0/${V0}5/HL_FILE1 +EXPECT_WITHIN $HEAL_TIMEOUT "$SIZE" ugly_stat $M0 $B0/${V0}5 FILE1 +EXPECT_WITHIN $HEAL_TIMEOUT "$SIZE" ugly_stat $M0 $B0/${V0}5 HL_FILE1 cleanup; #G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=1417540 |