From 6b3fec37931cbf3f7995b119e5a14702d5226772 Mon Sep 17 00:00:00 2001 From: Sunny Kumar Date: Sat, 21 Sep 2019 01:07:30 +0530 Subject: geo-rep : fix sub-command during worker connection Problem: Geo-rep session for non-root going faulty. Solution: During worker start we do not construct slave url and use 'args.resource_remote' which is basically just slave-hostname. This works better for root session but fails in non-root session during ssh command. Using slave url solves this issue. Backport of: > Patch: https://review.gluster.org/23465 > BUG: 1753928 > Change-Id: Ib83552fde77f81c208896494b323514ab37ebf22 > Signed-off-by: Sunny Kumar fixes: bz#1755213 Change-Id: Ib83552fde77f81c208896494b323514ab37ebf22 Signed-off-by: Kotresh HR --- geo-replication/syncdaemon/subcmds.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'geo-replication/syncdaemon/subcmds.py') diff --git a/geo-replication/syncdaemon/subcmds.py b/geo-replication/syncdaemon/subcmds.py index 4ece7e06b89..f8515f2607b 100644 --- a/geo-replication/syncdaemon/subcmds.py +++ b/geo-replication/syncdaemon/subcmds.py @@ -73,7 +73,11 @@ def subcmd_worker(args): Popen.init_errhandler() fcntl.fcntl(args.feedback_fd, fcntl.F_SETFD, fcntl.FD_CLOEXEC) local = GLUSTER("localhost", args.master) - slavehost, slavevol = args.slave.split("::") + slave_url, slavevol = args.slave.split("::") + if "@" not in slave_url: + slavehost = args.resource_remote + else: + slavehost = "%s@%s" % (slave_url.split("@")[0], args.resource_remote) remote = SSH(slavehost, slavevol) remote.connect_remote() local.connect() -- cgit