diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-05-02 19:19:27 +0530 | 
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-05-09 20:27:02 -0700 | 
| commit | 9ff65ba5ff96b92ee39b48b06a9b08873c248e87 (patch) | |
| tree | 863aa0ca299569f12fa338e898c0ed0a6e8218d7 | |
| parent | 6e27b9744f89430d4a33b36f96a78d7b048b16ff (diff) | |
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 <rkavunga@redhat.com>
>Reviewed-on: http://review.gluster.org/10494
>Reviewed-by: Dan Lambright <dlambrig@redhat.com>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Tested-by: NetBSD Build System
Change-Id: I35f460297dfd6b6883c62a6826c99e4f1f3aece2
BUG: 1220051
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/10712
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 3 | 
2 files changed, 3 insertions, 2 deletions
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: "  | 
