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>

4 files changed, 37 insertions, 1 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index 7d8c7d12b4e..1e54e3bad48 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -484,6 +484,11 @@ glusterd_add_volume_detail_to_dict (glusterd_volinfo_t *volinfo,
         if (ret)
                 goto out;
 
+        snprintf (key, sizeof (key), "volume%d.arbiter_count", count);
+        ret = dict_set_int32 (volumes, key, volinfo->arbiter_count);
+        if (ret)
+                goto out;
+
         snprintf (key, 256, "volume%d.transport", count);
         ret = dict_set_int32 (volumes, key, volinfo->transport_type);
         if (ret)
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);
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.h b/xlators/mgmt/glusterd/src/glusterd-store.h
index 4933adbdf7b..683edaef058 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.h
+++ b/xlators/mgmt/glusterd/src/glusterd-store.h
@@ -46,6 +46,7 @@ typedef enum glusterd_store_ver_ac_{
 #define GLUSTERD_STORE_KEY_VOL_REPLICA_CNT      "replica_count"
 #define GLUSTERD_STORE_KEY_VOL_DISPERSE_CNT     "disperse_count"
 #define GLUSTERD_STORE_KEY_VOL_REDUNDANCY_CNT   "redundancy_count"
+#define GLUSTERD_STORE_KEY_VOL_ARBITER_CNT      "arbiter_count"
 #define GLUSTERD_STORE_KEY_VOL_BRICK            "brick"
 #define GLUSTERD_STORE_KEY_VOL_VERSION          "version"
 #define GLUSTERD_STORE_KEY_VOL_TRANSPORT        "transport-type"
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));