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-store.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-store.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-store.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 02291b1f838..73d416b384e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -949,9 +949,20 @@ glusterd_volume_exclude_options_write (int fd, glusterd_volinfo_t *volinfo) if (ret) goto out; + if ((conf->op_version >= GD_OP_VERSION_3_7_6) && + volinfo->arbiter_count) { + snprintf (buf, sizeof (buf), "%d", volinfo->arbiter_count); + ret = gf_store_save_value (fd, + GLUSTERD_STORE_KEY_VOL_ARBITER_CNT, + buf); + if (ret) + goto out; + } + if (conf->op_version >= GD_OP_VERSION_3_6_0) { snprintf (buf, sizeof (buf), "%d", volinfo->disperse_count); - ret = gf_store_save_value (fd, GLUSTERD_STORE_KEY_VOL_DISPERSE_CNT, + ret = gf_store_save_value (fd, + GLUSTERD_STORE_KEY_VOL_DISPERSE_CNT, buf); if (ret) goto out; @@ -2589,6 +2600,8 @@ glusterd_store_update_volinfo (glusterd_volinfo_t *volinfo) } else if (!strncmp (key, GLUSTERD_STORE_KEY_VOL_REPLICA_CNT, strlen (GLUSTERD_STORE_KEY_VOL_REPLICA_CNT))) { volinfo->replica_count = atoi (value); + } else if (!strcmp (key, GLUSTERD_STORE_KEY_VOL_ARBITER_CNT)) { + volinfo->arbiter_count = atoi (value); } else if (!strncmp (key, GLUSTERD_STORE_KEY_VOL_DISPERSE_CNT, strlen (GLUSTERD_STORE_KEY_VOL_DISPERSE_CNT))) { volinfo->disperse_count = atoi (value); |