diff options
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 6 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 13 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 27 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.h | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 10 |
5 files changed, 52 insertions, 7 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 1a6ddea2f54..2505fcff4de 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -4854,7 +4854,7 @@ glusterd_get_volume_opts (rpcsvc_request_t *req, dict_t *dict) (dict, _gf_false, key, orig_key, - volinfo->dict, + volinfo, &rsp.op_errstr); if (ret && !rsp.op_errstr) { snprintf (err_str, @@ -4880,7 +4880,7 @@ glusterd_get_volume_opts (rpcsvc_request_t *req, dict_t *dict) } else { /* Handle the "all" volume option request */ ret = glusterd_get_default_val_for_volopt (dict, _gf_true, NULL, - NULL, volinfo->dict, + NULL, volinfo, &rsp.op_errstr); if (ret && !rsp.op_errstr) { snprintf (err_str, sizeof(err_str), @@ -5487,7 +5487,7 @@ glusterd_get_state (rpcsvc_request_t *req, dict_t *dict) vol_all_opts = dict_new (); ret = glusterd_get_default_val_for_volopt (vol_all_opts, - _gf_true, NULL, NULL, volinfo->dict, + _gf_true, NULL, NULL, volinfo, &rsp.op_errstr); if (ret) { gf_msg (this->name, GF_LOG_ERROR, 0, diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 1cd41b0e9bd..ec55082d3d1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -2514,6 +2514,15 @@ out: return ret; } +/* This is a hack to prevent client-io-threads from being loaded in the graph + * when the cluster-op-version is bumped up from 3.8.x to 3.13.x. The key is + * deleted subsequently in glusterd_create_volfiles(). */ +static int +glusterd_dict_set_skip_cliot_key (glusterd_volinfo_t *volinfo) +{ + return dict_set_int32 (volinfo->dict, "skip-CLIOT", 1); +} + static int glusterd_op_set_all_volume_options (xlator_t *this, dict_t *dict, char **op_errstr) @@ -2603,6 +2612,10 @@ glusterd_op_set_all_volume_options (xlator_t *this, dict_t *dict, ret = glusterd_update_volumes_dict (volinfo); if (ret) goto out; + + if (glusterd_dict_set_skip_cliot_key (volinfo)) + goto out; + if (!volinfo->is_snap_volume) { svc = &(volinfo->snapd.svc); ret = svc->manager (svc, volinfo, diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 6c40907e7f7..af30756c947 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -13091,10 +13091,30 @@ out: return ret; } +char * +glusterd_get_option_value (glusterd_volinfo_t *volinfo, char *key) +{ + char *value = NULL; + + if (!glusterd_is_volume_replicate(volinfo)) + goto ret; + + if (!strcmp (key, "performance.client-io-threads")) { + value = "off"; + } else if (!strcmp (key, "cluster.quorum-type")) { + if (volinfo->replica_count%2) { + value = "auto"; + } + } +ret: + return value; +} + int glusterd_get_default_val_for_volopt (dict_t *ctx, gf_boolean_t all_opts, char *input_key, char *orig_key, - dict_t *vol_dict, char **op_errstr) + glusterd_volinfo_t *volinfo, + char **op_errstr) { struct volopt_map_entry *vme = NULL; int ret = -1; @@ -13105,6 +13125,7 @@ glusterd_get_default_val_for_volopt (dict_t *ctx, gf_boolean_t all_opts, char dict_key[50] = {0,}; gf_boolean_t key_found = _gf_false; glusterd_conf_t *priv = NULL; + dict_t *vol_dict = NULL; this = THIS; GF_ASSERT (this); @@ -13112,6 +13133,7 @@ glusterd_get_default_val_for_volopt (dict_t *ctx, gf_boolean_t all_opts, priv = this->private; GF_VALIDATE_OR_GOTO (this->name, priv, out); + vol_dict = volinfo->dict; GF_VALIDATE_OR_GOTO (this->name, vol_dict, out); /* Check whether key is passed for a single option */ @@ -13132,6 +13154,9 @@ glusterd_get_default_val_for_volopt (dict_t *ctx, gf_boolean_t all_opts, ret = dict_get_str (priv->opts, vme->key, &def_val); if (!def_val) { ret = dict_get_str (vol_dict, vme->key, &def_val); + if (ret == -ENOENT) + def_val = glusterd_get_option_value (volinfo, + vme->key); if (!def_val) { if (vme->value) { def_val = vme->value; diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h index af4d91843ad..0e9e54a0687 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.h +++ b/xlators/mgmt/glusterd/src/glusterd-utils.h @@ -729,7 +729,8 @@ glusterd_get_global_options_for_all_vols (rpcsvc_request_t *req, dict_t *dict, int glusterd_get_default_val_for_volopt (dict_t *dict, gf_boolean_t all_opts, char *key, char *orig_key, - dict_t *vol_dict, char **err_str); + glusterd_volinfo_t *volinfo, + char **err_str); int glusterd_check_client_op_version_support (char *volname, uint32_t op_version, diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index f9fcf88a256..caf421165f8 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -59,7 +59,6 @@ extern struct volopt_map_entry glusterd_volopt_map[]; } \ } while (0 /* CONSTCOND */) - static int volgen_graph_build_clients (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, dict_t *set_dict, void *param); @@ -524,6 +523,11 @@ volgen_graph_set_options_generic (volgen_graph_t *graph, dict_t *dict, odt.data_t_fake = _gf_false; data = dict_get (dict, vme->key); + if (!strcmp (vme->key, "performance.client-io-threads") && + dict_get_str_boolean (dict, "skip-CLIOT", + _gf_false) == _gf_true) { + continue; + } if (data) process_option (vme->key, data, &odt); @@ -6672,11 +6676,13 @@ glusterd_create_volfiles (glusterd_volinfo_t *volinfo) "Could not generate client volfiles"); - ret = glusterd_generate_gfproxyd_volfile (volinfo); + ret = glusterd_generate_gfproxyd_volfile (volinfo); if (ret) gf_log (this->name, GF_LOG_ERROR, "Could not generate gfproxy volfiles"); + dict_del (volinfo->dict, "skip-CLIOT"); + out: return ret; } |