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-21 11:39:14 -0700
commitd01b00ae2b124dfdd6905e463533a715f1cedc5b (patch)
tree672f9907f5ea70a005dae43bfcd03cc6c995c20b /tests/basic/ec/ec-6-2.t
parentd32bc8aa365dbb804af8c8ff18eecbf349eba9e8 (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. This is a backport of http://review.gluster.org/8892/ BUG: 1149118 Change-Id: I8a40b7f07fc8ecd2c721bad1bcdd351dd8504155 Signed-off-by: Xavier Hernandez <xhernandez@datalab.es> Reviewed-on: http://review.gluster.org/8902 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Dan Lambright <dlambrig@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