diff options
| author | Joseph Fernandes <josferna@redhat.com> | 2015-04-30 16:54:16 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-05-07 04:47:50 -0700 |
| commit | 929bf9babfd538d9bb16daa8e66222c8a6c37be6 (patch) | |
| tree | 968428fdcc38e886f0eeadbc83d6ed3843e2457b | |
| parent | f2244001dfec1b9c313c23526415e7ff9e03ad6f (diff) | |
glusterd/quota/tiering: Fixing volgen of quotad
The quotad's graph generation was happening wrongly for
tiered volume. The check is been inserted.
> http://review.gluster.org/#/c/10474/
> Cherry picked from commit cfb9ea4dc68440a18b7f07422901a715b00776f0
> Change-Id: I5554bc5280b0fbaec750e9008fdd930ad53a774f
> BUG: 1214219
> Signed-off-by: Joseph Fernandes <josferna@redhat.com>
> Reviewed-on: http://review.gluster.org/10474
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
> Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Change-Id: I0ad0bdea58c50b24e5f48b5af25a97f995889c5c
BUG: 1219048
Signed-off-by: Joseph Fernandes <josferna@redhat.com>
Reviewed-on: http://review.gluster.org/10474
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Signed-off-by: Joseph Fernandes <josferna@redhat.com>
Reviewed-on: http://review.gluster.org/10611
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 1b9225128c6..ad5a296b359 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -3445,9 +3445,11 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, goto out; if (volinfo->type == GF_CLUSTER_TYPE_TIER) - ret = volume_volgen_graph_build_clusters_tier (graph, volinfo, _gf_false); + ret = volume_volgen_graph_build_clusters_tier + (graph, volinfo, _gf_false); else - ret = volume_volgen_graph_build_clusters (graph, volinfo, _gf_false); + ret = volume_volgen_graph_build_clusters + (graph, volinfo, _gf_false); if (ret == -1) goto out; @@ -4480,8 +4482,12 @@ build_quotad_graph (volgen_graph_t *graph, dict_t *mod_dict) if (ret) goto out; - ret = volume_volgen_graph_build_clusters (&cgraph, voliter, - _gf_true); + if (voliter->type == GF_CLUSTER_TYPE_TIER) + ret = volume_volgen_graph_build_clusters_tier + (&cgraph, voliter, _gf_true); + else + ret = volume_volgen_graph_build_clusters + (&cgraph, voliter, _gf_true); if (ret) { ret = -1; goto out; |