From 853293b6dd759a20418a4878821db57f933cc50d Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Mon, 18 Apr 2011 17:21:24 +0000 Subject: 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 Signed-off-by: Anand Avati 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 --- xlators/mgmt/glusterd/src/glusterd-op-sm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xlators/mgmt/glusterd/src') diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 70fddf205..c51853d90 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) -- cgit