diff options
| author | Sachin Pandit <spandit@redhat.com> | 2014-06-04 10:30:59 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2014-06-09 03:27:45 -0700 |
| commit | e95dcdc3193cd33d98349d92218e438e5e37cebc (patch) | |
| tree | a2746c7e666873c343df15bbc408af60bd6c9b4c /xlators/mgmt | |
| parent | 4215d071cec4fc8a62ca4fd6212d83f931838829 (diff) | |
mgmt/glusterd : Import the global options irrespective of change in
volume information.
Problem : global options maintained by glusterd was getting
synced only when there was change in volume information.
Solution : Import the global option irrespective of change in
volume information.
Change-Id: I9e59b3cb25bdc19601a09fcf8df2e31a8481ece0
BUG: 1104642
Signed-off-by: Sachin Pandit <spandit@redhat.com>
Reviewed-on: http://review.gluster.org/7970
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'xlators/mgmt')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 95401c1ca05..c8ea95c7719 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -5615,6 +5615,13 @@ glusterd_compare_friend_data (dict_t *peer_data, int32_t *status, GF_ASSERT (peer_data); GF_ASSERT (status); + ret = glusterd_import_global_opts (peer_data); + if (ret) { + gf_log (this->name, GF_LOG_ERROR, "Importing global " + "options failed"); + goto out; + } + ret = dict_get_int32 (peer_data, "count", &count); if (ret) goto out; @@ -5642,9 +5649,6 @@ glusterd_compare_friend_data (dict_t *peer_data, int32_t *status, stale_shd = _gf_true; if (glusterd_is_nodesvc_running ("quotad")) stale_qd = _gf_true; - ret = glusterd_import_global_opts (peer_data); - if (ret) - goto out; ret = glusterd_import_friend_volumes (peer_data); if (ret) goto out; |