diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2015-10-30 15:56:14 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-11-17 01:26:52 -0800 |
| commit | 60a4288f0a2444821e17ac6eaeb402b466dd4a1a (patch) | |
| tree | e6a55e3921fb70a4735e95f09175072fe4060639 /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | 133bc60c9b93245a51900d0e46bf19cc7916f2dc (diff) | |
mgmt/glusterd: Store arbiter-count and restore it
Backport of http://review.gluster.com/12475
Problem:
1) Glusterd doesn't remember about arbiter information of replica volume in
store. When glusterd goes down and comes backup, arbiter volumes will
become replica volumes.
2) Glusterd doesn't import/export arbiter information to/from the other peers.
3) Volume info doesn't show any arbiter count in the output.
Fix:
1) Persist arbiter information in glusterd-store
2) Import/Export arbiter information of the volume
3) Change volume info output to show arbiter count.
>Change-Id: I2db81e73d2694b01f7d07b08a17b41ad5a55c361
>BUG: 1276675
>Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
BUG: 1276907
Change-Id: I95c9857d645e02831892092bdd07539cc1a58270
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/12479
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Ravishankar N <ravishankar@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 1a1a3b10c06..fbe82e38940 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -547,6 +547,7 @@ glusterd_volinfo_dup (glusterd_volinfo_t *volinfo, new_volinfo->type = volinfo->type; new_volinfo->replica_count = volinfo->replica_count; + new_volinfo->arbiter_count = volinfo->arbiter_count; new_volinfo->stripe_count = volinfo->stripe_count; new_volinfo->disperse_count = volinfo->disperse_count; new_volinfo->redundancy_count = volinfo->redundancy_count; @@ -2235,6 +2236,12 @@ glusterd_add_volume_to_dict (glusterd_volinfo_t *volinfo, goto out; memset (key, 0, sizeof (key)); + snprintf (key, sizeof (key), "%s%d.arbiter_count", prefix, count); + ret = dict_set_int32 (dict, key, volinfo->arbiter_count); + if (ret) + goto out; + + memset (key, 0, sizeof (key)); snprintf (key, sizeof (key), "%s%d.disperse_count", prefix, count); ret = dict_set_int32 (dict, key, volinfo->disperse_count); if (ret) @@ -3311,6 +3318,16 @@ glusterd_import_volinfo (dict_t *peer_data, int count, GD_MSG_DICT_GET_FAILED, "peer is possibly old version"); + /* not having a 'arbiter_count' key is not a error + (as peer may be of old version) */ + memset (key, 0, sizeof (key)); + snprintf (key, sizeof (key), "%s%d.arbiter_count", prefix, count); + ret = dict_get_int32 (peer_data, key, &new_volinfo->arbiter_count); + if (ret) + gf_msg (THIS->name, GF_LOG_INFO, 0, + GD_MSG_DICT_GET_FAILED, + "peer is possibly old version"); + /* not having a 'disperse_count' key is not a error (as peer may be of old version) */ memset (key, 0, sizeof (key)); |