From aa292ab99c9db37dd5080aa5d65f24a8887b855b Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Wed, 21 Aug 2013 20:38:09 +0530 Subject: gsyncd / geo-rep: fix "regular file" overloading rename entry operation on the slave was using source parent gfid and basename when renames are overloaded to use regular file creation. This patch fixes the issue by using the destination parent gfid and basename for these cases. Change-Id: I1a4e8df7f07905224ce44ef5abd6f180234285ab BUG: 1003800 Tested-by: Amar Tumballi Signed-off-by: Venky Shankar Reviewed-on: http://review.gluster.org/5754 Tested-by: Gluster Build System Reviewed-by: Avra Sengupta Tested-by: Avra Sengupta Reviewed-by: Anand Avati --- geo-replication/syncdaemon/resource.py | 1 + 1 file changed, 1 insertion(+) (limited to 'geo-replication/syncdaemon') diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py index 2357b4f9..c3d31b78 100644 --- a/geo-replication/syncdaemon/resource.py +++ b/geo-replication/syncdaemon/resource.py @@ -525,6 +525,7 @@ class Server(object): en = e['entry1'] st = lstat(entry) if isinstance(st, int): + (pg, bname) = entry2pb(en) blob = entry_pack_reg(gfid, bname, e['stat']) else: errno_wrap(os.rename, [entry, en], [ENOENT, EEXIST]) -- cgit