andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glusterd: volume get fixes for client-io-threads & quorum-type

Browse Source 
1. If a replica volume created on glusterfs-3.8 was upgraded to
glusterfs-3.12, `gluster vol get volname client-io-threads` displayed
'on' even though it wasn't and the xlator wasn't loaded on
the client-graph. This was due to removing certain checks in
glusterd_get_default_val_for_volopt as a part of commit
47604fad4c2a3951077e41e0c007ceb979bb2c24. Fix it.

2. Also, as a part of op-version bump-up, client-io-threads was being
loaded on the clients  during volfile regeneration. Prevent it.

3. AFR assumes quorum-type to be auto in newly created replic 3 (odd
replica in general) volumes but `gluster vol get quorum-type` displays
'none'. Fix it.

Change-Id: I19e586361ed1065c70fb378533d3b4dac1095df9
BUG: 1545056
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
This commit is contained in:
Ravishankar N 2018-02-14 12:15:53 +05:30 committed by Atin Mukherjee
parent 685d4409f9
commit bd2c45fe31
5 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xlators/mgmt/glusterd/src/glusterd-handler.c
View File

@ -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,

13
xlators/mgmt/glusterd/src/glusterd-op-sm.c
View File

@ -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,

27
xlators/mgmt/glusterd/src/glusterd-utils.c
View File

@ -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;

3
xlators/mgmt/glusterd/src/glusterd-utils.h
View File

@ -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,

10
xlators/mgmt/glusterd/src/glusterd-volgen.c
View File

@ -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;
}