diff options
| author | hari gowtham <hgowtham@redhat.com> | 2015-12-04 18:34:36 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-12-16 09:28:19 -0800 |
| commit | 5f6baf2cb061fd32a35bff2081b8ba966871e39d (patch) | |
| tree | 3b06fcd464f4eb22b6290cbdb5ea0126a8759985 /cli | |
| parent | e35b9e272be54c3a2f9f9e7409053c6fb94707bb (diff) | |
tier/glusterd : making new tier detach command throw warning
back port of : http://review.gluster.org/#/c/12883/
For detach tier, the validation was done using the string "detach-tier"
but the new commands used has the string "tier". Making the string use
"tier" to compare, creates problem as the tier status and tier detach
have the keyword "tier". So tier detach and tier status were separated.
and strtok was used to prevent the condition from passing when the
volume name has a substring of "tier". (only the second word from the
string is got and checked if the feature is tier).
Problem: new detach tier command doesnt throw warnings like
"not a tier volume" or " detach tier not started" respectively
instead it prints empty output.
Fix: while validate the volume is checked if its a tiered volume
if yes it is checked if the detach tier is started, else a warning
is thrown respectively.
>Change-Id: I94246d53b18ab0e9406beaf459eaddb7c5b766c2
>BUG: 1288517
>Signed-off-by: hari gowtham <hgowtham@redhat.com>
>Reviewed-on: http://review.gluster.org/12883
>Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Change-Id: I1ac3b6baaec644dbc2025085a7f17abd56ba169d
BUG: 1291970
Signed-off-by: hari gowtham <hgowtham@redhat.com>
Reviewed-on: http://review.gluster.org/12976
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 110cba44704..b623051cad9 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -4545,7 +4545,7 @@ gf_cli_detach_tier (call_frame_t *frame, xlator_t *this, } else { /* Need rebalance status to be sent :-) */ if (command == GF_OP_CMD_STATUS) - cmd |= GF_DEFRAG_CMD_STATUS; + cmd |= GF_DEFRAG_CMD_DETACH_STATUS; else cmd |= GF_DEFRAG_CMD_STOP_DETACH_TIER; |