glusterd: persistent client xlator/ afr changelog names

-Add a unique brick-id field to glusterd_brickinfo_t
-Persist the id to the brickinfo file
-Use the brick-id as the client xlator name during vol create, add-brick and
 replace-brick operations.
-For older volumes,generate the id in-memory during glusterd restore but defer
 writing it to the brickinfo file until the next volume set operation.
-send and receive the brick-ids during peer probe.

Feature page:
www.gluster.org/community/documentation/index.php/Features/persistent-AFR-changelog-xattributes

Related patch:
http://review.gluster.org/#/c/7122

Change-Id: Ib7f1570004e33f4144476410eec2b84df4e41448
BUG: 1066778
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/7155
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Reviewed-by: Kaushal M <kaushal@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>

1 files changed, 19 insertions, 2 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 0ee430969cb..37cf98894d2 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -241,6 +241,11 @@ glusterd_store_brickinfo_write (int fd, glusterd_brickinfo_t *brickinfo)
         if (ret)
                 goto out;
 
+        ret = gf_store_save_value (fd, GLUSTERD_STORE_KEY_BRICK_ID,
+                                   brickinfo->brick_id);
+        if (ret)
+                goto out;
+
         if (!brickinfo->vg[0])
                 goto out;
 
@@ -1493,7 +1498,6 @@ out:
         return ret;
 }
 
-
 int32_t
 glusterd_store_retrieve_bricks (glusterd_volinfo_t *volinfo)
 {
@@ -1511,6 +1515,7 @@ glusterd_store_retrieve_bricks (glusterd_volinfo_t *volinfo)
         gf_store_iter_t         *tmpiter = NULL;
         char                    *tmpvalue = NULL;
         struct pmap_registry    *pmap = NULL;
+        int                      brickid = 0;
         gf_store_op_errno_t     op_errno = GD_STORE_SUCCESS;
 
         GF_ASSERT (volinfo);
@@ -1606,6 +1611,9 @@ glusterd_store_retrieve_bricks (glusterd_volinfo_t *volinfo)
                                     strlen (GLUSTERD_STORE_KEY_BRICK_VGNAME))) {
                                 strncpy (brickinfo->vg, value,
                                          sizeof (brickinfo->vg));
+                        } else if (!strcmp(key, GLUSTERD_STORE_KEY_BRICK_ID)) {
+                                strncpy (brickinfo->brick_id, value,
+                                         sizeof (brickinfo->brick_id));
                         } else {
                                 gf_log ("", GF_LOG_ERROR, "Unknown key: %s",
                                         key);
@@ -1620,13 +1628,22 @@ glusterd_store_retrieve_bricks (glusterd_volinfo_t *volinfo)
                                                       &op_errno);
                 }
 
-                if (op_errno != GD_STORE_EOF)
+                if (op_errno != GD_STORE_EOF) {
+                        gf_log ("", GF_LOG_ERROR, "Error parsing brickinfo: "
+                                "op_errno=%d", op_errno);
                         goto out;
+                }
                 ret = gf_store_iter_destroy (iter);
 
                 if (ret)
                         goto out;
 
+                if (brickinfo->brick_id[0] == '\0') {
+                        /* This is an old volume upgraded to op_version 4 */
+                       GLUSTERD_ASSIGN_BRICKID_TO_BRICKINFO (brickinfo, volinfo,
+                                                             brickid++);
+                }
+
                 list_add_tail (&brickinfo->brick_list, &volinfo->bricks);
                 brick_count++;
         }