From d5e67cd2b2d60166f16337e4441fa50a9e488094 Mon Sep 17 00:00:00 2001 From: hari gowtham Date: Mon, 16 May 2016 10:55:17 +0530 Subject: tier/cli : printing a warning instead of skipping the node Problem: skipping the status of the nodes down creates confusion to the user as one might see the status as completed for all nodes and while performing detach commit, the operation will fail as the node is down Fix: Display a warning message Note: When the last node is down (as per the peer list) then warning message can't be displayed as the total number of peers participating in the transaction is considered to be the total count. Change-Id: Ib7afbd1b26df3378e4d537db06f41f5c105ad86e BUG: 1324439 Signed-off-by: hari gowtham Reviewed-on: http://review.gluster.org/14347 Tested-by: hari gowtham Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Atin Mukherjee NetBSD-regression: NetBSD Build System --- tests/basic/tier/new-tier-cmds.t | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'tests/basic') diff --git a/tests/basic/tier/new-tier-cmds.t b/tests/basic/tier/new-tier-cmds.t index e4fef69d265..dbfac54938e 100644 --- a/tests/basic/tier/new-tier-cmds.t +++ b/tests/basic/tier/new-tier-cmds.t @@ -19,18 +19,6 @@ function create_dist_tier_vol () { TEST $CLI_1 volume attach-tier $V0 $H1:$B1/${V0}_h1 $H2:$B2/${V0}_h2 $H3:$B3/${V0}_h3 } -function tier_detach_commit () { - $CLI_1 volume tier $V0 detach commit | grep "success" | wc -l -} - -function tier_detach_status_node_down () { - $CLI_1 volume tier $V0 detach status | wc -l -} - -function tier_status_node_down () { - $CLI_1 volume tier $V0 status | wc -l -} - cleanup; #setup cluster and test volume @@ -58,10 +46,10 @@ TEST $CLI_1 volume tier $V0 detach status TEST kill_node 2 #check if we have the rest of the node available printed in the output of detach status -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "4" tier_detach_status_node_down +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" tier_detach_status_node_down #check if we have the rest of the node available printed in the output of tier status -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "5" tier_status_node_down +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" tier_status_node_down TEST $glusterd_2; -- cgit