From ae14513eb82929662b11e4c304877030a7d685cd Mon Sep 17 00:00:00 2001 From: Sunil Kumar Acharya Date: Tue, 18 Jul 2017 11:36:19 +0530 Subject: cluster/ec: Test script failing with brick multiplexing enabled Problem: Killing the bricks(using kill signal) in test scripts will result in test failures with brick multiplexing enabled. Solution: Updated the script to use kill_brick function to bring down the bricks. BUG: 1472094 Change-Id: Ibbf1fdc1be660ad3cd93e95af2838c0aae0181af Signed-off-by: Sunil Kumar Acharya Reviewed-on: https://review.gluster.org/17809 Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Pranith Kumar Karampuri --- tests/basic/ec/ec-1468261.t | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/basic/ec/ec-1468261.t b/tests/basic/ec/ec-1468261.t index 9c4f981ab47..d687d7bf6a0 100644 --- a/tests/basic/ec/ec-1468261.t +++ b/tests/basic/ec/ec-1468261.t @@ -32,16 +32,12 @@ EXPECT_WITHIN $IO_WAIT_TIMEOUT "^$" get_hex_xattr trusted.ec.dirty $B0/${V0}4/te EXPECT_WITHIN $IO_WAIT_TIMEOUT "^$" get_hex_xattr trusted.ec.dirty $B0/${V0}5/test_dir #Touch a file and kill two bricks -pid0=`get_brick_pid $V0 $H0 $B0/${V0}0` -pid1=`get_brick_pid $V0 $H0 $B0/${V0}1` TEST touch $M0/test_dir/new_file -kill $pid0 -kill $pid1 +TEST kill_brick $V0 $H0 $B0/${V0}0 +TEST kill_brick $V0 $H0 $B0/${V0}1 EXPECT_WITHIN $CHILD_UP_TIMEOUT "4" ec_child_up_count $V0 0 #Dirty should be set on up bricks -EXPECT_WITHIN $IO_WAIT_TIMEOUT "^$" get_hex_xattr trusted.ec.dirty $B0/${V0}0/test_dir -EXPECT_WITHIN $IO_WAIT_TIMEOUT "^$" get_hex_xattr trusted.ec.dirty $B0/${V0}1/test_dir EXPECT_WITHIN $IO_WAIT_TIMEOUT "^00000000000000010000000000000001$" get_hex_xattr trusted.ec.dirty $B0/${V0}2/test_dir EXPECT_WITHIN $IO_WAIT_TIMEOUT "^00000000000000010000000000000001$" get_hex_xattr trusted.ec.dirty $B0/${V0}3/test_dir EXPECT_WITHIN $IO_WAIT_TIMEOUT "^00000000000000010000000000000001$" get_hex_xattr trusted.ec.dirty $B0/${V0}4/test_dir -- cgit