1 files changed, 67 insertions, 21 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 21a973086..1eb03f1de 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -37,6 +37,7 @@
 #include "glusterd-pmap.h"
 #include "glusterfs-acl.h"
 #include "glusterd-syncop.h"
+#include "glusterd-locks.h"
 
 #include "xdr-generic.h"
 #include <sys/resource.h>
@@ -1307,16 +1308,6 @@ out:
         return ret;
 }
 
-/* Caller should ensure that brick process is not running*/
-static void
-_reap_brick_process (char *pidfile, char *brickpath)
-{
-        unlink (pidfile);
-        /* Brick process is not running and pmap may have an entry for it.*/
-        pmap_registry_remove (THIS, 0, brickpath,
-                              GF_PMAP_PORT_BRICKSERVER, NULL);
-}
-
 static int
 _mk_rundir_p (glusterd_volinfo_t *volinfo)
 {
@@ -1371,8 +1362,6 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t  *volinfo,
         if (gf_is_service_running (pidfile, NULL))
                 goto connect;
 
-        _reap_brick_process (pidfile, brickinfo->path);
-
         port = brickinfo->port;
         if (!port)
                 port = pmap_registry_alloc (THIS);
@@ -3544,7 +3533,8 @@ glusterd_import_friend_volume (dict_t *vols, size_t count)
         if (ret)
                 goto out;
 
-        list_add_tail (&new_volinfo->vol_list, &priv->volumes);
+        list_add_order (&new_volinfo->vol_list, &priv->volumes,
+                        glusterd_compare_volume_name);
 out:
         gf_log ("", GF_LOG_DEBUG, "Returning with ret: %d", ret);
         return ret;
@@ -7911,7 +7901,7 @@ glusterd_volume_status_copy_to_op_ctx_dict (dict_t *aggr, dict_t *rsp_dict)
         if (ret)
                 goto out;
 
-        if (cmd & GF_CLI_STATUS_ALL && is_origin_glusterd ()) {
+        if (cmd & GF_CLI_STATUS_ALL && is_origin_glusterd (ctx_dict)) {
                 ret = dict_get_int32 (rsp_dict, "vol_count", &vol_count);
                 if (ret == 0) {
                         ret = dict_set_int32 (ctx_dict, "vol_count",
@@ -8802,20 +8792,66 @@ glusterd_handle_node_rsp (dict_t *req_dict, void *pending_entry,
         return ret;
 }
 
+int32_t
+glusterd_set_originator_uuid (dict_t *dict)
+{
+        int          ret              = -1;
+        uuid_t      *originator_uuid  = NULL;
+
+        GF_ASSERT (dict);
+
+        originator_uuid = GF_CALLOC (1, sizeof(uuid_t),
+                                     gf_common_mt_uuid_t);
+        if (!originator_uuid) {
+                ret = -1;
+                goto out;
+        }
+
+        uuid_copy (*originator_uuid, MY_UUID);
+        ret = dict_set_bin (dict, "originator_uuid",
+                            originator_uuid, sizeof (uuid_t));
+        if (ret) {
+                gf_log ("", GF_LOG_ERROR,
+                        "Failed to set originator_uuid.");
+                goto out;
+        }
+
+out:
+        if (ret && originator_uuid)
+                GF_FREE (originator_uuid);
+
+        return ret;
+}
+
 /* Should be used only when an operation is in progress, as that is the only
  * time a lock_owner is set
  */
 gf_boolean_t
-is_origin_glusterd ()
+is_origin_glusterd (dict_t *dict)
 {
-        int     ret = 0;
-        uuid_t  lock_owner = {0,};
+        gf_boolean_t  ret              = _gf_false;
+        uuid_t        lock_owner       = {0,};
+        uuid_t        *originator_uuid = NULL;
 
-        ret = glusterd_get_lock_owner (&lock_owner);
-        if (ret)
-                return _gf_false;
+        GF_ASSERT (dict);
+
+        ret = dict_get_bin (dict, "originator_uuid",
+                            (void **) &originator_uuid);
+        if (ret) {
+                /* If not originator_uuid has been set, then the command
+                 * has been originated from a glusterd running on older version
+                 * Hence fetching the lock owner */
+                ret = glusterd_get_lock_owner (&lock_owner);
+                if (ret) {
+                        ret = _gf_false;
+                        goto out;
+                }
+                ret = !uuid_compare (MY_UUID, lock_owner);
+        } else
+                ret = !uuid_compare (MY_UUID, *originator_uuid);
 
-        return (uuid_compare (MY_UUID, lock_owner) == 0);
+out:
+        return ret;
 }
 
 int
@@ -9352,3 +9388,13 @@ glusterd_rpc_clnt_unref (glusterd_conf_t *conf, rpc_clnt_t *rpc)
         return ret;
 }
 
+int32_t
+glusterd_compare_volume_name(struct list_head *list1, struct list_head *list2)
+{
+        glusterd_volinfo_t *volinfo1 = NULL;
+        glusterd_volinfo_t *volinfo2 = NULL;
+
+        volinfo1 = list_entry(list1, glusterd_volinfo_t, vol_list);
+        volinfo2 = list_entry(list2, glusterd_volinfo_t, vol_list);
+        return strcmp(volinfo1->volname, volinfo2->volname);
+}