From e1da9e393dfe1276ef6e0dd701643a7d4c8c7844 Mon Sep 17 00:00:00 2001
From: Kotresh HR <khiremat@redhat.com>
Date: Thu, 20 Apr 2017 07:18:52 -0400
Subject: [PATCH 406/406] glusterd/geo-rep: Fix snapshot create in geo-rep
 setup

glusterd persists geo-rep sessions in glusterd
info file which is represented by dictionary
'volinfo->gsync_slaves' in memory. Glusterd also
maintains in memory active geo-rep sessions in
dictionary 'volinfo->gsync_active_slaves' whose key
is "<slave_url>::<slavhost>".

When glusterd is restarted while the geo-rep sessions
are active, it builds the 'volinfo->gsync_active_slaves'
from persisted glusterd info file. Since slave volume
uuid is added to "voinfo->gsync_slaves" with the commit
"http://review.gluster.org/13111", it builds it with key
"<slave_url>::<slavehost>:<slavevol_uuid>" which is
wrong. So during snapshot pre-validation which checks
whether geo-rep is active or not, it always says it is
ACTIVE, as geo-rep stop would not deleted this key.
Fixed the same in this patch.

> BUG: 1443977
> Signed-off-by: Kotresh HR <khiremat@redhat.com>
> Reviewed-on: https://review.gluster.org/17093
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>

Change-Id: I185178910b4b8a62e66aba406d88d12fabc5c122
BUG: 1416024
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/104414
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 xlators/mgmt/glusterd/src/glusterd-utils.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index e9a5183..19b6dcc 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -5530,7 +5530,7 @@ _local_gsyncd_start (dict_t *this, char *key, data_t *value, void *data)
         glusterd_conf_t    *priv                        = NULL;
         gf_boolean_t        is_template_in_use          = _gf_false;
         gf_boolean_t        is_paused                   = _gf_false;
-        char               *key1                        = NULL;
+        char                key1[1024]                  = {0,};
         xlator_t           *this1                       = NULL;
 
         this1 = THIS;
@@ -5625,9 +5625,8 @@ _local_gsyncd_start (dict_t *this, char *key, data_t *value, void *data)
                 goto out;
         }
 
-        /* Move the pointer two characters ahead to surpass '//' */
-        if ((key1 = strchr (slave, '/')))
-                key1 = key1 + 2;
+        /* Form key1 which is "<user@><slave_host>::<slavevol>" */
+        snprintf (key1, sizeof (key1), "%s::%s", slave_url, slave_vol);
 
         /* Looks for the last status, to find if the session was running
          * when the node went down. If the session was just created or
-- 
1.8.3.1