From a97ad9b69bb17f2351c59512fa9c6cb25d82b4da Mon Sep 17 00:00:00 2001 From: Xavier Hernandez Date: Thu, 18 Sep 2014 18:42:34 +0200 Subject: 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 Reviewed-on: http://review.gluster.org/8892 Reviewed-by: Emmanuel Dreyfus Tested-by: Emmanuel Dreyfus Tested-by: Gluster Build System Reviewed-by: Dan Lambright Reviewed-by: Vijay Bellur --- tests/basic/ec/ec-4-1.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/basic/ec/ec-4-1.t') diff --git a/tests/basic/ec/ec-4-1.t b/tests/basic/ec/ec-4-1.t index d34e1fb4e95..3f0d0c72e44 100644 --- a/tests/basic/ec/ec-4-1.t +++ b/tests/basic/ec/ec-4-1.t @@ -8,7 +8,7 @@ DISPERSE=4 REDUNDANCY=1 -# This must be equal to 44 * $DISPERSE + 106 -TESTS_EXPECTED_IN_LOOP=282 +# This must be equal to 36 * $DISPERSE + 109 +TESTS_EXPECTED_IN_LOOP=253 . $(dirname $0)/ec-common -- cgit