diff options
| -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"); |