summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2011-04-18 17:21:24 +0000
committerAnand Avati <avati@gluster.com>2011-04-19 02:30:08 -0700
commit853293b6dd759a20418a4878821db57f933cc50d (patch)
tree888e97f9d9574573a70a964fe84a6df990da2f52
parentd884d4ce74e3d2c582698c9b54b58b4529472a4e (diff)
mgmt/glusterd: geo-rep: restart-upon-reconfig: don't bail out if the gsync session we adjust does not exist
Signed-off-by: Csaba Henk <csaba@lowlife.hu> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2777 (geo-replication config setting should have effect on already running sessions) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2777
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 70fddf20521..c51853d9016 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -4374,8 +4374,10 @@ glusterd_check_restart_gsync_session (glusterd_volinfo_t *volinfo, char *slave)
priv = THIS->private;
- ret = glusterd_gsync_get_uuid (slave, volinfo, uuid);
- if ((ret == 0) && (uuid_compare (priv->uuid, uuid) == 0)) {
+ if (glusterd_gsync_get_uuid (slave, volinfo, uuid))
+ /* session does not exist, nothing to do */
+ goto out;
+ if (uuid_compare (priv->uuid, uuid) == 0) {
ret = glusterd_check_gsync_running_local (volinfo->volname,
slave, &is_running);
if (ret)