summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2016-01-05 15:36:28 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-01-22 22:02:04 -0800
commitea94b2b8767e0d477a672355d758e0e8393362ee (patch)
tree3b63eeddd603be37ea2c34f3881c442eae80cd20
parenta593921aa0eada17637667938f432875b410139d (diff)
tests: Fix spurious failure in bug-1221481-allow-fops-on-dir-split-brain.t.
Occasionally, when ls is executed, prior to READDIRP, a STAT is wound on the operand directory. And AFR fails STAT with EIO if it is in metadata split-brain which "dir" is in the test case in question. As a result, ls also fails with EIO, causing test 20 to return negative exit status. The fix is in the test script where the parts that cause the dir to go into metadata split-brain have been removed. Now "dir" will only have entry split-brain. Change-Id: I4e4e6ba0a2401c7168719cd44e5f4f4bcb8fdd89 BUG: 1295702 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/13172 Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
-rwxr-xr-xrun-tests.sh1
-rw-r--r--tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t5
2 files changed, 1 insertions, 5 deletions
diff --git a/run-tests.sh b/run-tests.sh
index 9ce914efba6..f9000a1d918 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -206,7 +206,6 @@ function is_bad_test ()
./tests/bugs/glusterd/bug-1238706-daemons-stop-on-peer-cleanup.t \
./tests/geo-rep/georep-basic-dr-rsync.t \
./tests/geo-rep/georep-basic-dr-tarssh.t \
- ./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/replace-brick-self-heal.t \
diff --git a/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t b/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t
index f332019d893..c4752c488f4 100644
--- a/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t
+++ b/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t
@@ -15,19 +15,16 @@ TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0
TEST mkdir $M0/dir
TEST touch $M0/dir/file{1..5}
-#Create metadata and entry split-brain
+#Create entry split-brain
TEST kill_brick $V0 $H0 $B0/$V0"1"
-TEST setfattr -n user.attribute -v value1 $M0/dir
TEST touch $M0/dir/FILE
TEST $CLI volume start $V0 force
EXPECT_WITHIN $CHILD_UP_TIMEOUT '1' afr_child_up_status_meta $M0 $V0-replicate-0 1
TEST kill_brick $V0 $H0 $B0/$V0"0"
-TEST setfattr -n user.attribute -v value2 $M0/dir
TEST touch $M0/dir/FILE
TEST $CLI volume start $V0 force
EXPECT_WITHIN $CHILD_UP_TIMEOUT '1' afr_child_up_status_meta $M0 $V0-replicate-0 0
-TEST ! getfattr $M0/dir
cd $M0/dir
EXPECT "6" echo $(ls | wc -l)
TEST ! cat FILE