diff options
| author | Dan Lambright <dlambrig@redhat.com> | 2015-03-30 14:27:44 -0400 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2015-04-08 07:28:21 +0000 |
| commit | a8260044291cb6eee44974d8c52caa9f4cfb3993 (patch) | |
| tree | 3b9b0f83bd6ae869a26a75dafdc988196a62d049 /xlators/mgmt | |
| parent | f0cd1d73c63001740cd7691a77df7631c9b8e8dc (diff) | |
glusterd: Support distributed replicated volumes on hot tier
We did not set up the graph properly for hot tiers with replicated
subvolumes. Also add check that the file has not already been moved
by another replicated brick on the same node.
Change-Id: I9adef565ab60f6774810962d912168b77a6032fa
BUG: 1206517
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-on: http://review.gluster.org/10054
Reviewed-by: Joseph Fernandes <josferna@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'xlators/mgmt')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 7 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 49 |
2 files changed, 39 insertions, 17 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index b32dbb89134..165622f87ef 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -465,6 +465,9 @@ __glusterd_handle_add_brick (rpcsvc_request_t *req) ret = -1; goto out; } + + ret = dict_get_int32 (dict, "type", &type); + goto brick_val; } @@ -1835,6 +1838,7 @@ glusterd_op_perform_attach_tier (dict_t *dict, { int ret = 0; int replica_count = 0; + int type = 0; /* * Store the new (cold) tier's structure until the graph is generated. @@ -1853,6 +1857,9 @@ glusterd_op_perform_attach_tier (dict_t *dict, else volinfo->tier_info.hot_replica_count = 1; volinfo->tier_info.hot_brick_count = count; + ret = dict_get_int32 (dict, "type", &type); + volinfo->tier_info.hot_type = type; + ret = dict_set_int32 (dict, "type", GF_CLUSTER_TYPE_TIER); return ret; } diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 8a61da2e8ec..bbac2a2283b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -3107,11 +3107,13 @@ volume_volgen_graph_build_clusters (volgen_graph_t *graph, /* All other cases, it will have one or the other cluster type */ switch (volinfo->type) { case GF_CLUSTER_TYPE_REPLICATE: - clusters = volgen_link_bricks_from_list_tail (graph, volinfo, - replicate_args[0], - replicate_args[1], - volinfo->brick_count, - volinfo->replica_count); + clusters = volgen_link_bricks_from_list_tail + (graph, volinfo, + replicate_args[0], + replicate_args[1], + volinfo->brick_count, + volinfo->replica_count); + if (clusters < 0) goto out; break; @@ -3284,12 +3286,12 @@ volume_volgen_graph_build_clusters_tier (volgen_graph_t *graph, volinfo->type = volinfo->tier_info.cold_type; sprintf (volinfo->volname, "%s-cold", st_volname); - ret = volume_volgen_graph_build_clusters (graph, volinfo, _gf_false); + ret = volume_volgen_graph_build_clusters (graph, volinfo, is_quotad); if (ret) goto out; cxl = first_of(graph); - volinfo->type = GF_CLUSTER_TYPE_TIER; + volinfo->type = volinfo->tier_info.hot_type; volinfo->brick_count = volinfo->tier_info.hot_brick_count; volinfo->replica_count = volinfo->tier_info.hot_replica_count; volinfo->dist_leaf_count = glusterd_get_dist_leaf_count(volinfo); @@ -3297,21 +3299,34 @@ volume_volgen_graph_build_clusters_tier (volgen_graph_t *graph, sprintf (volinfo->volname, "%s-hot", st_volname); - if (volinfo->dist_leaf_count == 1) { - dist_count = volinfo->brick_count / volinfo->dist_leaf_count; - ret = volgen_link_bricks_from_list_head (graph, volinfo, - "cluster/distribute", - "%s-dht", - dist_count, - dist_count); + dist_count = volinfo->brick_count / volinfo->dist_leaf_count; + + if (volinfo->dist_leaf_count != 1) { + ret = volgen_link_bricks_from_list_head + (graph, volinfo, + "cluster/replicate", + "%s-replicate-%d", + volinfo->brick_count, + volinfo->replica_count); + if (ret != -1) + volgen_link_bricks_from_list_tail (graph, volinfo, + "cluster/distribute", + "%s-dht", + dist_count, + dist_count); } else { - ret = volume_volgen_graph_build_clusters (graph, - volinfo, - _gf_false); + ret = volgen_link_bricks_from_list_head (graph, volinfo, + "cluster/distribute", + "%s-dht", + dist_count, + dist_count); } + if (ret == -1) + goto out; hxl = first_of(graph); + volinfo->type = GF_CLUSTER_TYPE_TIER; xl = volgen_graph_add_nolink (graph, "cluster/tier", "%s", "tier-dht", 0); gf_asprintf(&rule, "%s-hot-dht", st_volname); |