From 8ea1eaf46153b56fb4c652a8eb9fb95a49038373 Mon Sep 17 00:00:00 2001
From: Xavier Hernandez <xhernandez@datalab.es>
Date: Mon, 6 Oct 2014 16:34:58 +0200
Subject: ec: Fix incorrect management of healed bricks

The final lookup made to restore final file attributes after a self-heal
did clear the mask of bad bricks, causing that the final setattr won't
modify any brick at all. This caused that some attriutes, specially the
modification time of the file didn't get updated properly.

Now the mask of healed bricks is saved before doing the last lookup.
It's also used to correctly report the repaired bricks.

Change-Id: Ib94083c9e1b562515dfb54f9574120f1f031dccc
BUG: 1149723
Signed-off-by: Xavier Hernandez <xhernandez@datalab.es>
Reviewed-on: http://review.gluster.org/8905
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
---
 tests/basic/ec/self-heal.t | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'tests/basic')

diff --git a/tests/basic/ec/self-heal.t b/tests/basic/ec/self-heal.t
index a40193f7447..d8a2f7988a0 100644
--- a/tests/basic/ec/self-heal.t
+++ b/tests/basic/ec/self-heal.t
@@ -12,7 +12,7 @@ if [ ! -d $tmp ]; then
     exit 1
 fi
 
-TESTS_EXPECTED_IN_LOOP=85
+TESTS_EXPECTED_IN_LOOP=250
 
 TEST glusterd
 TEST pidof glusterd
@@ -34,16 +34,24 @@ for idx in {0..5}; do
     brick[$idx]=$(gf_get_gfid_backend_file_path $B0/$V0$idx)
 done
 
+
 cd $M0
 TEST cp $tmp/test test
 TEST chmod 644 test
+TEST touch -d "@946681200" test
 EXPECT "-rw-r--r--" stat -c "%A" test
+EXPECT "946681200" stat -c "%Y" test
 
 for idx1 in {0..5}; do
     TEST chmod 666 ${brick[$idx1]}/test
+    TEST truncate -s 0 ${brick[$idx1]}/test
+    TEST setfattr -n user.test -v "test1" ${brick[$idx1]}/test
     sleep 1
     EXPECT "-rw-r--r--" stat -c "%A" test
+    EXPECT_WITHIN $HEAL_TIMEOUT "262144" stat -c "%s" ${brick[$idx1]}/test
     EXPECT_WITHIN $HEAL_TIMEOUT "-rw-r--r--" stat -c "%A" ${brick[$idx1]}/test
+    EXPECT_WITHIN $HEAL_TIMEOUT "946681200" stat -c "%Y" ${brick[$idx1]}/test
+    TEST ! getfattr -n user.test ${brick[$idx1]}/test
 done
 
 for idx1 in {0..4}; do
@@ -51,32 +59,24 @@ for idx1 in {0..4}; do
         if [ $idx1 -ne $idx2 ]; then
             TEST chmod 666 ${brick[$idx1]}/test
             TEST chmod 600 ${brick[$idx2]}/test
+            TEST truncate -s 0 ${brick[$idx1]}/test
+            TEST truncate -s 2097152 ${brick[$idx2]}/test
+            TEST setfattr -n user.test -v "test1" ${brick[$idx1]}/test
+            TEST setfattr -n user.test -v "test2" ${brick[$idx2]}/test
             sleep 1
             EXPECT "-rw-r--r--" stat -c "%A" test
+            EXPECT_WITHIN $HEAL_TIMEOUT "262144" stat -c "%s" ${brick[$idx1]}/test
+            EXPECT_WITHIN $HEAL_TIMEOUT "262144" stat -c "%s" ${brick[$idx2]}/test
             EXPECT_WITHIN $HEAL_TIMEOUT "-rw-r--r--" stat -c "%A" ${brick[$idx1]}/test
             EXPECT_WITHIN $HEAL_TIMEOUT "-rw-r--r--" stat -c "%A" ${brick[$idx2]}/test
+            EXPECT_WITHIN $HEAL_TIMEOUT "946681200" stat -c "%Y" ${brick[$idx1]}/test
+            EXPECT_WITHIN $HEAL_TIMEOUT "946681200" stat -c "%Y" ${brick[$idx2]}/test
+            TEST ! getfattr -n user.test ${brick[$idx1]}/test
+            TEST ! getfattr -n user.test ${brick[$idx2]}/test
         fi
     done
 done
 
-TEST truncate -s 0 ${brick[0]}/test
-TEST truncate -s 2097152 ${brick[1]}/test
-TEST setfattr -n user.test -v "test1" ${brick[0]}/test
-TEST setfattr -n user.test -v "test2" ${brick[1]}/test
-TEST chmod 600 ${brick[0]}/test
-TEST chmod 666 ${brick[1]}/test
-sleep 1
-
-EXPECT "1048576" stat -c "%s" test
-TEST ! getfattr -n user.test test
-
-EXPECT_WITHIN $HEAL_TIMEOUT "262144" stat -c "%s" ${brick[0]}/test
-EXPECT_WITHIN $HEAL_TIMEOUT "262144" stat -c "%s" ${brick[1]}/test
-TEST ! getfattr -n user.test ${brick[0]}/test
-TEST ! getfattr -n user.test ${brick[1]}/test
-EXPECT "-rw-r--r--" stat -c "%A" ${brick[0]}/test
-EXPECT "-rw-r--r--" stat -c "%A" ${brick[1]}/test
-
 TEST kill_brick $V0 $H0 $B0/${V0}0
 TEST kill_brick $V0 $H0 $B0/${V0}1
 TEST cp $tmp/test test2
-- 
cgit