diff options
| author | hari gowtham <hgowtham@redhat.com> | 2016-05-16 10:55:17 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2016-05-20 11:19:49 -0700 |
| commit | 903f27305cbff51f174f2704ea13ffa65083fd24 (patch) | |
| tree | b090e6467421c0dbd3b5c3e6abcd696a5f096a60 /tests | |
| parent | ccb463647eaba1798943e1eb9ce6e6b3fa2e71c2 (diff) | |
tier/cli : printing a warning instead of skipping the node
back-port of : http://review.gluster.org/#/c/14347/8
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 <hgowtham@redhat.com>
Change-Id: Ie4296e932abaf163edc55b540b26dc6f5824ea85
BUG: 1328410
Signed-off-by: hari gowtham <hgowtham@redhat.com>
Reviewed-on: http://review.gluster.org/14458
Tested-by: hari gowtham <hari.gowtham005@gmail.com>
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/tier/new-tier-cmds.t | 16 | ||||
| -rw-r--r-- | tests/tier.rc | 13 |
2 files changed, 15 insertions, 14 deletions
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; diff --git a/tests/tier.rc b/tests/tier.rc index ee37e0704fa..69512c3fb4e 100644 --- a/tests/tier.rc +++ b/tests/tier.rc @@ -134,3 +134,16 @@ function rebalance_run_time () { echo $total; } + +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 | grep "WARNING" | wc -l +} + +function tier_status_node_down () { + $CLI_1 volume tier $V0 status | grep "WARNING" | wc -l +} + |