diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-05-13 16:53:22 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2015-05-28 07:00:25 -0700 |
| commit | f1fb71bbf677be40b7bab997221f832c7fa7527a (patch) | |
| tree | c6b9c6791266c37a194e1a0b02c803f50edcf6f1 | |
| parent | d133071e7ced1794e09ffe4ef8cb14cf5b9f7e75 (diff) | |
tiering: Correct errors in cli and glusterd
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
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 6 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index f3ed8adfdc2..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) && @@ -4302,7 +4302,7 @@ gf_cli_detach_tier (call_frame_t *frame, xlator_t *this, goto out; if ((command != GF_OP_CMD_STATUS) && - (command != GF_DEFRAG_CMD_STOP_DETACH_TIER)) { + (command != GF_OP_CMD_STOP_DETACH_TIER)) { ret = cli_to_glusterd (&req, frame, gf_cli_detach_tier_cbk, @@ -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) { diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 1c2299db016..a4c475a2def 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -7715,8 +7715,7 @@ glusterd_volume_status_copy_to_op_ctx_dict (dict_t *aggr, dict_t *rsp_dict) goto out; } - ret = dict_set_int32 (ctx_dict, "hot_brick_count", - node_count + rsp_node_count); + ret = dict_set_int32 (ctx_dict, "hot_brick_count", hot_brick_count); if (ret) { gf_log (THIS->name, GF_LOG_ERROR, "Failed to update hot_brick_count"); |