From 9ff65ba5ff96b92ee39b48b06a9b08873c248e87 Mon Sep 17 00:00:00 2001 From: Mohammed Rafi KC Date: Sat, 2 May 2015 19:19:27 +0530 Subject: tiering: Remove unwanted check for tier type volume Back port of http://review.gluster.org/10494 >Change-Id: I2def61ebf348558e5f6a138265e3329d9a5407a3 >BUG: 1216898 >Signed-off-by: Mohammed Rafi KC >Reviewed-on: http://review.gluster.org/10494 >Reviewed-by: Dan Lambright >Tested-by: Gluster Build System >Tested-by: NetBSD Build System Change-Id: I35f460297dfd6b6883c62a6826c99e4f1f3aece2 BUG: 1220051 Signed-off-by: Mohammed Rafi KC Reviewed-on: http://review.gluster.org/10712 Reviewed-by: Dan Lambright Tested-by: Gluster Build System Tested-by: NetBSD Build System --- xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 2 +- xlators/mgmt/glusterd/src/glusterd-volgen.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'xlators/mgmt') diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 6ed65976aea..3699518207b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -1346,7 +1346,7 @@ glusterd_op_stage_add_brick (dict_t *dict, char **op_errstr, dict_t *rsp_dict) ret = dict_get_int32 (dict, "replica-count", &replica_count); if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, + gf_log (THIS->name, GF_LOG_DEBUG, "Unable to get replica count"); } diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 58328b553a4..3b6a8c03b43 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -2737,7 +2737,8 @@ volgen_graph_build_clients (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, goto out; } - if ((volinfo->dist_leaf_count < volinfo->brick_count) && + if ((volinfo->type != GF_CLUSTER_TYPE_TIER) && + (volinfo->dist_leaf_count < volinfo->brick_count) && ((volinfo->brick_count % volinfo->dist_leaf_count) != 0)) { gf_log ("", GF_LOG_ERROR, "volume inconsistency: " -- cgit