summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-volgen.c
diff options
context:
space:
mode:
authorAmar Tumballi <amarts@redhat.com>2018-10-03 15:30:10 +0530
committerAtin Mukherjee <amukherj@redhat.com>2018-10-31 02:24:49 +0000
commit733139551322e49e7e5617356cf96e30780d2749 (patch)
treefaa4ef5f75a77b0ef5a4bdab4f5884db2730f1db /xlators/mgmt/glusterd/src/glusterd-volgen.c
parent19775e0445411cca9ddd9d294fd54d0b6fbe6a03 (diff)
stripe: remove the translator from build and glusterd
Based on the proposal to remove few features as they are not actively maintained [1], removing stripe translator from the build. Also make sure there are no regression tests involving stripe translator. [1] https://lists.gluster.org/pipermail/gluster-users/2018-July/034400.html Note that this patch aims at removing the translator from build, and a followup patch is needed to remove the code from repository. Updates: bz#1364707 Change-Id: I235b305338f138e29e9f30cba65bc0dadbebbbd5 Signed-off-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c35
1 files changed, 2 insertions, 33 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 13b289f..57b0fcc 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -2207,8 +2207,7 @@ brick_graph_add_index(volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
if (ret)
goto out;
}
- if ((volinfo->type == GF_CLUSTER_TYPE_STRIPE_REPLICATE ||
- volinfo->type == GF_CLUSTER_TYPE_REPLICATE ||
+ if ((volinfo->type == GF_CLUSTER_TYPE_REPLICATE ||
volinfo->type == GF_CLUSTER_TYPE_NONE)) {
ret = xlator_set_option(xl, "xattrop-dirty-watchlist",
"trusted.afr.dirty");
@@ -2881,8 +2880,7 @@ perfxl_option_handler(volgen_graph_t *graph, struct volopt_map_entry *vme,
* performance
*/
if (!strcmp(vme->key, "performance.client-io-threads") &&
- (GF_CLUSTER_TYPE_STRIPE_REPLICATE == volinfo->type ||
- GF_CLUSTER_TYPE_REPLICATE == volinfo->type))
+ (GF_CLUSTER_TYPE_REPLICATE == volinfo->type))
return 0;
}
@@ -3894,8 +3892,6 @@ volume_volgen_graph_build_clusters(volgen_graph_t *graph,
gf_boolean_t is_quotad)
{
char *tier_args[] = {"cluster/tier", "%s-tier-%d"};
- char *stripe_args[] = {"cluster/stripe", "%s-stripe-%d"};
- int rclusters = 0;
int clusters = 0;
int dist_count = 0;
int ret = -1;
@@ -3916,35 +3912,11 @@ volume_volgen_graph_build_clusters(volgen_graph_t *graph,
if (clusters < 0)
goto out;
break;
- case GF_CLUSTER_TYPE_STRIPE:
- clusters = volgen_link_bricks_from_list_tail(
- graph, volinfo, stripe_args[0], stripe_args[1],
- volinfo->brick_count, volinfo->stripe_count);
- if (clusters < 0)
- goto out;
- break;
case GF_CLUSTER_TYPE_TIER:
ret = volgen_link_bricks_from_list_head(
graph, volinfo, tier_args[0], tier_args[1],
volinfo->brick_count, volinfo->replica_count);
break;
- case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
- /* Replicate after the clients, then stripe */
- if (volinfo->replica_count == 0)
- goto out;
- clusters = volgen_graph_build_afr_clusters(graph, volinfo);
- if (clusters < 0)
- goto out;
-
- rclusters = volinfo->brick_count / volinfo->replica_count;
- GF_ASSERT(rclusters == clusters);
- clusters = volgen_link_bricks_from_list_tail(
- graph, volinfo, stripe_args[0], stripe_args[1], rclusters,
- volinfo->stripe_count);
- if (clusters < 0)
- goto out;
- break;
-
case GF_CLUSTER_TYPE_DISPERSE:
clusters = volgen_graph_build_ec_clusters(graph, volinfo);
if (clusters < 0)
@@ -4867,7 +4839,6 @@ volgen_get_shd_key(int type)
switch (type) {
case GF_CLUSTER_TYPE_REPLICATE:
- case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
key = "cluster.self-heal-daemon";
break;
case GF_CLUSTER_TYPE_DISPERSE:
@@ -4971,7 +4942,6 @@ build_afr_ec_clusters(volgen_graph_t *graph, glusterd_volinfo_t *volinfo)
int clusters = -1;
switch (volinfo->type) {
case GF_CLUSTER_TYPE_REPLICATE:
- case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
clusters = volgen_graph_build_afr_clusters(graph, volinfo);
break;
@@ -5061,7 +5031,6 @@ gd_is_self_heal_enabled(glusterd_volinfo_t *volinfo, dict_t *dict)
switch (volinfo->type) {
case GF_CLUSTER_TYPE_REPLICATE:
- case GF_CLUSTER_TYPE_STRIPE_REPLICATE:
case GF_CLUSTER_TYPE_DISPERSE:
shd_key = volgen_get_shd_key(volinfo->type);
shd_enabled = dict_get_str_boolean(dict, shd_key, _gf_true);