ca3909
From 924a25990948c9d76001cf4134fc5a2fcbf5c02c Mon Sep 17 00:00:00 2001
ca3909
From: Kotresh HR <khiremat@redhat.com>
ca3909
Date: Fri, 16 Aug 2019 15:38:49 +0530
ca3909
Subject: [PATCH 278/284] geo-rep: Fix worker connection issue
ca3909
ca3909
All the workers connects to primary slave node. It should
ca3909
connect to available slave nodes in round robin fashion
ca3909
and choose different slave node if the corresponding slave
ca3909
node is down. This patch fixes the same.
ca3909
ca3909
Thanks Aravinda for the help in root causing this.
ca3909
ca3909
Backport of:
ca3909
 > Patch: https://review.gluster.org/23247/
ca3909
 > Change-Id: I9f8e7744f4adb8a24833cf173681d109710f98cb
ca3909
 > Signed-off-by: Kotresh HR <khiremat@redhat.com>
ca3909
 > Updates: bz#1737484
ca3909
ca3909
Change-Id: I9f8e7744f4adb8a24833cf173681d109710f98cb
ca3909
Signed-off-by: Kotresh HR <khiremat@redhat.com>
ca3909
BUG: 1729915
ca3909
Reviewed-on: https://code.engineering.redhat.com/gerrit/178961
ca3909
Tested-by: RHGS Build Bot <nigelb@redhat.com>
ca3909
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
ca3909
---
ca3909
 geo-replication/syncdaemon/subcmds.py | 3 ++-
ca3909
 1 file changed, 2 insertions(+), 1 deletion(-)
ca3909
ca3909
diff --git a/geo-replication/syncdaemon/subcmds.py b/geo-replication/syncdaemon/subcmds.py
ca3909
index 4ece7e0..8de7db2 100644
ca3909
--- a/geo-replication/syncdaemon/subcmds.py
ca3909
+++ b/geo-replication/syncdaemon/subcmds.py
ca3909
@@ -73,7 +73,8 @@ def subcmd_worker(args):
ca3909
     Popen.init_errhandler()
ca3909
     fcntl.fcntl(args.feedback_fd, fcntl.F_SETFD, fcntl.FD_CLOEXEC)
ca3909
     local = GLUSTER("localhost", args.master)
ca3909
-    slavehost, slavevol = args.slave.split("::")
ca3909
+    slavevol = args.slave.split("::")[-1]
ca3909
+    slavehost = args.resource_remote
ca3909
     remote = SSH(slavehost, slavevol)
ca3909
     remote.connect_remote()
ca3909
     local.connect()
ca3909
-- 
ca3909
1.8.3.1
ca3909