tests: Fix sparse-file-self-heal.t

Psuedo Problem:
https://build.gluster.org/job/rackspace-regression-2GB-triggered/16682/consoleFull

The 'zeroedfile' disk usage comparision which is failing in this .t file
fails so only on XFS. The test passes when the backend is on a s̶a̶n̶e̶r̶
different filesystem like EXT4 or BTRFS. This is due to the speculative
preallocation in XFS which can reserve different disk space on different
XFS mounts for the same version and same file operation. See BZ 1277992
for an example of XFS behaviour.

Fix:
Don't compare the disk usage of the file on the bricks of the replica:
instead, check that the disk space consumed is atleast equal to the size
of the file.

Also remove sparse-file-self-heal.t from is_bad_test()

Change-Id: If43f59549136ebf91f17ff9d958954b3587afe56
BUG: 1298111
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/13233
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.com>

2 files changed, 22 insertions, 11 deletions

diff --git a/run-tests.sh b/run-tests.sh
index 1ed420732f1..c99452d2e54 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -209,7 +209,6 @@ function is_bad_test ()
               ./tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t \
               ./tests/bugs/fuse/bug-924726.t \
               ./tests/basic/afr/split-brain-healing.t \
-              ./tests/basic/afr/sparse-file-self-heal.t \
               ./tests/basic/afr/replace-brick-self-heal.t \
               ./tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t \
               ./tests/bugs/tier/bug-1286974.t \
diff --git a/tests/basic/afr/sparse-file-self-heal.t b/tests/basic/afr/sparse-file-self-heal.t
index d540ef786d1..04b77c41de1 100644
--- a/tests/basic/afr/sparse-file-self-heal.t
+++ b/tests/basic/afr/sparse-file-self-heal.t
@@ -85,11 +85,17 @@ EXPECT "1" has_holes $B0/${V0}0/big2bigger
 USED_KB=`du -s $B0/${V0}0/FILE|cut -f1`
 TEST [ $USED_KB -lt 1000000 ]
 
-#Check that the non-sparse file consumes the same disk space in both bricks post
-#self-heal
-USED_KB1=`du -s $B0/${V0}0/zeroedfile|cut -f1`
-USED_KB2=`du -s $B0/${V0}1/zeroedfile|cut -f1`
-TEST [ $USED_KB1 -eq $USED_KB2 ]
+#Check that the non-sparse file has the same file size on both bricks and that
+#the disk usage is greater than or equal to the file size. We could have checked
+#that the disk usage is just equal to the file size but XFS does speculative
+#preallocation due to which disk usage can be more than the file size.
+STAT_SIZE1=$(stat -c "%s" $B0/${V0}0/zeroedfile)
+STAT_SIZE2=$(stat -c "%s" $B0/${V0}1/zeroedfile)
+TEST [ $STAT_SIZE1 -eq $STAT_SIZE2 ]
+USED_KB1="$((`stat -c  %b $B0/${V0}0/zeroedfile` * `stat -c %B $B0/${V0}0/zeroedfile`))"
+TEST [ $USED_KB1 -ge $STAT_SIZE1 ]
+USED_KB2="$((`stat -c  %b $B0/${V0}1/zeroedfile` * `stat -c %B $B0/${V0}1/zeroedfile`))"
+TEST [ $USED_KB2 -ge $STAT_SIZE2 ]
 
 TEST rm -f $M0/*
 
@@ -160,10 +166,16 @@ EXPECT "0" has_holes $B0/${V0}0/small
 USED_KB=`du -s $B0/${V0}0/FILE|cut -f1`
 TEST [ $USED_KB -lt 1000000 ]
 
-#Check that the non-sparse file consumes the same disk space in both bricks post
-#self-heal.
-USED_KB1=`du -s $B0/${V0}0/zeroedfile|cut -f1`
-USED_KB2=`du -s $B0/${V0}1/zeroedfile|cut -f1`
-TEST [ $USED_KB1 -eq $USED_KB2 ]
+#Check that the non-sparse file has the same file size on both bricks and that
+#the disk usage is greater than or equal to the file size. We could have checked
+#that the disk usage is just equal to the file size but XFS does speculative
+#preallocation due to which disk usage can be more than the file size.
+STAT_SIZE1=$(stat -c "%s" $B0/${V0}0/zeroedfile)
+STAT_SIZE2=$(stat -c "%s" $B0/${V0}1/zeroedfile)
+TEST [ $STAT_SIZE1 -eq $STAT_SIZE2 ]
+USED_KB1="$((`stat -c  %b $B0/${V0}0/zeroedfile` * `stat -c %B $B0/${V0}0/zeroedfile`))"
+TEST [ $USED_KB1 -ge $STAT_SIZE1 ]
+USED_KB2="$((`stat -c  %b $B0/${V0}1/zeroedfile` * `stat -c %B $B0/${V0}1/zeroedfile`))"
+TEST [ $USED_KB2 -ge $STAT_SIZE2 ]
 
 cleanup