From 53d932b490c505901ddd1a0133e8125ad6dfd24c Mon Sep 17 00:00:00 2001
From: Raghavendra Bhat <raghavendra@redhat.com>
Date: Mon, 16 Jun 2014 20:38:42 +0530
Subject: mgmt/glusterd: save the snapd port in volinfo after starting snapd

Change-Id: I9266bbf4f67a2135f9a81b32fe88620be11af6ea
BUG: 1109889
Signed-off-by: Raghavendra Bhat <raghavendra@redhat.com>
Reviewed-on: http://review.gluster.org/8084
Reviewed-by: Kaushal M <kaushal@redhat.com>
Tested-by: Kaushal M <kaushal@redhat.com>
---
 tests/bugs/bug-1109889.t                   | 72 ++++++++++++++++++++++++++++++
 tests/volume.rc                            |  8 ++++
 xlators/mgmt/glusterd/src/glusterd-utils.c |  2 +
 xlators/protocol/client/src/client.c       |  2 +
 4 files changed, 84 insertions(+)
 create mode 100644 tests/bugs/bug-1109889.t

diff --git a/tests/bugs/bug-1109889.t b/tests/bugs/bug-1109889.t
new file mode 100644
index 00000000000..2c2239fc57d
--- /dev/null
+++ b/tests/bugs/bug-1109889.t
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
+. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../fileio.rc
+. $(dirname $0)/../nfs.rc
+
+cleanup;
+
+TEST init_n_bricks 3;
+TEST setup_lvm 3;
+
+TEST glusterd;
+
+TEST pidof glusterd;
+
+TEST $CLI volume create $V0 $H0:$L1 $H0:$L2 $H0:$L3;
+
+TEST $CLI volume start $V0;
+
+TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
+
+MOUNT_PID=`ps ax |grep "glusterfs --volfile-sever $H0 --volfile-id=$V0 $M0" | grep -v grep | awk '{print $1}' | head -1`
+
+for i in {1..10} ; do echo "file" > $M0/file$i ; done
+
+TEST $CLI snapshot create snap1 $V0;
+
+for i in {11..20} ; do echo "file" > $M0/file$i ; done
+
+TEST $CLI snapshot create snap2 $V0;
+
+mkdir $M0/dir1;
+mkdir $M0/dir2;
+
+for i in {1..10} ; do echo "foo" > $M0/dir1/foo$i ; done
+for i in {1..10} ; do echo "foo" > $M0/dir2/foo$i ; done
+
+TEST $CLI snapshot create snap3 $V0;
+
+for i in {11..20} ; do echo "foo" > $M0/dir1/foo$i ; done
+for i in {11..20} ; do echo "foo" > $M0/dir2/foo$i ; done
+
+TEST $CLI snapshot create snap4 $V0;
+
+TEST $CLI volume set $V0 features.uss enable;
+
+#let snapd get started properly and client connect to snapd
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" snap_client_connected_status $V0
+
+SNAPD_PID=$(ps aux | grep snapd | grep -v grep | awk '{print $2}');
+
+TEST [ $SNAPD_PID -gt 0 ];
+
+TEST stat $M0/.snaps;
+
+kill -KILL $SNAPD_PID;
+
+# let snapd die properly
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "0" snap_client_connected_status $V0
+
+TEST ! stat $M0/.snaps;
+
+TEST $CLI volume start $V0 force;
+
+# let client get the snapd port from glusterd and connect
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" snap_client_connected_status $V0
+
+TEST stat $M0/.snaps;
+
+cleanup;
diff --git a/tests/volume.rc b/tests/volume.rc
index db93ce7a2fe..5b5c2147392 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -84,6 +84,14 @@ function cleanup_mount_statedump {
         cleanup_statedump $(get_mount_process_pid $vol)
 }
 
+function snap_client_connected_status {
+         local vol=$1
+         local fpath=$(generate_mount_statedump $vol)
+         up=$(grep -A2 xlator.protocol.client.$vol-snapd-client.priv $fpath | tail -1 | cut -f 2 -d'=')
+         rm -f $fpath
+         echo "$up"
+}
+
 function _afr_child_up_status {
         local vol=$1
         #brick_id is (brick-num in volume info - 1)
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 9c6414905c3..66b92a712af 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -13385,6 +13385,8 @@ glusterd_snapd_start (glusterd_volinfo_t *volinfo, gf_boolean_t wait)
                 synclock_lock (&priv->big_lock);
         }
 
+        volinfo->snapd.port = snapd_port;
+
 connect:
         if (ret == 0)
                 glusterd_snapd_connect (volinfo, sockfpath);
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 7ab10b085b4..25565925a5d 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -2756,6 +2756,8 @@ client_priv_dump (xlator_t *this)
 
         gf_proc_dump_write("connecting", "%d", conf->connecting);
 
+        gf_proc_dump_write ("connected", "%d", conf->connected);
+
         if (conf->rpc) {
                 gf_proc_dump_write("total_bytes_read", "%"PRIu64,
                                    conf->rpc->conn.trans->total_bytes_read);
-- 
cgit