summaryrefslogtreecommitdiffstats
path: root/tests/basic/ec/ec-6-2.t
diff options
context:
space:
mode:
authorXavier Hernandez <xhernandez@datalab.es>2014-09-18 18:42:34 +0200
committerVijay Bellur <vbellur@redhat.com>2014-10-03 02:01:26 -0700
commita97ad9b69bb17f2351c59512fa9c6cb25d82b4da (patch)
treeb13239ea132df6efb4185a5dfd0cfea18dc0b28e /tests/basic/ec/ec-6-2.t
parent7e76bd24305ee29506dd11be5a0691cfa65b6d0c (diff)
test/ec: Fix spurious failures caused by self-heal
The sha1sum of a file may update the access time of that file. If this happens while a brick is down, as it is forced in the test, that brick doesn't get the update, getting out of sync. When the brick is restarted, self-heal repairs the file, but the test shouldn't access brick contents until self-heal finishes. If this is combined with a kill of another brick before self-heal has finished repairing the file, the volume could become inaccessible. Since the purpose of these tests is only to check ec functionality (there is another test that checks self-heal), the test that corrupts the file has been removed. Additional checks to validate the state of the volume have been added to avoid some timing issues. BUG: 1144108 Change-Id: Ibd9288de519914663998a1fbc4321ec92ed6082c Signed-off-by: Xavier Hernandez <xhernandez@datalab.es> Reviewed-on: http://review.gluster.org/8892 Reviewed-by: Emmanuel Dreyfus <manu@netbsd.org> Tested-by: Emmanuel Dreyfus <manu@netbsd.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Dan Lambright <dlambrig@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests/basic/ec/ec-6-2.t')
-rw-r--r--tests/basic/ec/ec-6-2.t4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/basic/ec/ec-6-2.t b/tests/basic/ec/ec-6-2.t
index 23ec84e60e9..b4451f905a1 100644
--- a/tests/basic/ec/ec-6-2.t
+++ b/tests/basic/ec/ec-6-2.t
@@ -8,7 +8,7 @@
DISPERSE=6
REDUNDANCY=2
-# This must be equal to 44 * $DISPERSE + 106
-TESTS_EXPECTED_IN_LOOP=370
+# This must be equal to 36 * $DISPERSE + 109
+TESTS_EXPECTED_IN_LOOP=325
. $(dirname $0)/ec-common