diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2018-02-14 12:15:53 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2018-03-07 04:48:09 +0000 |
| commit | bd2c45fe3180fe36b042d5eabd348b6eaeb8d3e2 (patch) | |
| tree | 654acff37c5ff9f38b03f3e8b4e9e3e2c5c357c9 /xlators/mgmt/glusterd/src/glusterd-handler.c | |
| parent | 685d4409f9405a527c87b41d1d89f798729d30f4 (diff) | |
glusterd: volume get fixes for client-io-threads & quorum-type
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>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-handler.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 6 |
1 files changed, 3 insertions, 3 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, |