diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-05-13 16:53:22 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2015-05-31 21:31:53 -0700 |
| commit | 57abe450c1e90749a4a32247836f05b1195d5313 (patch) | |
| tree | 31be784f411299c87404f73d096e347f1893f9df /cli | |
| parent | 8a1e0e2d535f42bf76384d81a2e6dbd0364adea5 (diff) | |
tiering: Correct errors in cli and glusterd
Back port of http://review.gluster.org/10768
Problem 1:
volume info shows Cold Bricks instead of Tier type
eg:
Volume Name: patchy2
Type: Tier
Volume ID: 28c25b8d-b8a1-45dc-b4b7-cbd0b344f58f
Status: Started
Number of Bricks: 3
Transport-type: tcp
Hot Tier :
Hot Tier Type : Distribute
Number of Bricks: 1
Brick1: 10.70.1.35:/home/brick43
Cold Bricks:
Cold Tier Type : Distribute
Number of Bricks: 2
Brick2: 10.70.1.35:/home/brick19
Brick3: 10.70.1.35:/home/brick16
Options Reconfigured:
Problem 2: Detach-tier sending enums of Rebalance
detach-tier has it's own Enum to send with detach-tier command,
using that enums will make more appropriate.
Problem 3:
Wrongly sets hot_brick count during the dictionary copying for response
>Change-Id: Icc054a999a679456881bc70511470d32ff8a86e4
>BUG: 1211264
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Reviewed-on: http://review.gluster.org/10768
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
>Reviewed-by: Kaushal M <kaushal@redhat.com>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Tested-by: NetBSD Build System
Change-Id: I889d3b83a1f197b79eb71e594a1ad1f2037ed402
BUG: 1226024
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/10978
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Joseph Fernandes
Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 3304ad1978e..290028f6510 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -704,7 +704,7 @@ gf_cli_print_tier_info (dict_t *dict, int i, int brick_count) if (ret) goto out; - cli_out ("Cold Bricks:"); + cli_out ("Cold Tier:"); vol_type = cold_type; if ((cold_type != GF_CLUSTER_TYPE_TIER) && (cold_type > 0) && @@ -4314,7 +4314,7 @@ gf_cli_detach_tier (call_frame_t *frame, xlator_t *this, if (command == GF_OP_CMD_STATUS) cmd |= GF_DEFRAG_CMD_STATUS; else - cmd |= GF_DEFRAG_CMD_STOP; + cmd |= GF_DEFRAG_CMD_STOP_DETACH_TIER; ret = dict_set_int32 (dict, "rebalance-command", (int32_t) cmd); if (ret) { |