summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenky Shankar <vshankar@redhat.com>2013-08-07 11:53:06 +0530
committerAnand Avati <avati@redhat.com>2013-09-04 20:28:12 -0700
commit60431cecae08d2d39a2a3d6735b8544af8266f32 (patch)
tree04e6c8d8f4906289316c45bb746686901bcc5b91
parentfe98c2902fd13dac93e5add60d1f10b2cef8ae37 (diff)
gsyncd / geo-rep: fix regular file creation on rename
On creation of a regular file on the slave (this happens when an unlink()/rmdir() operation is performed on master after a rename() or a link(). This patch fixes the regular file creation on the slave when the above mentioned series of operation occurs. entry_ops() on the slave for a rename() was missing the stat() information. Change-Id: Idb80c6b3e27c1797dade1113ac8ce920db9c740c BUG: 994353 Original Author: Venky Shankar <vshankar@redhat.com> Signed-off-by: Venky Shankar <vshankar@redhat.com> Reviewed-on: http://review.gluster.org/5509 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Avra Sengupta <asengupt@redhat.com> Tested-by: Avra Sengupta <asengupt@redhat.com> Reviewed-by: Anand Avati <avati@redhat.com>
-rw-r--r--geo-replication/syncdaemon/master.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
index cf2f7db..c9abd91 100644
--- a/geo-replication/syncdaemon/master.py
+++ b/geo-replication/syncdaemon/master.py
@@ -893,7 +893,7 @@ class GMasterChangelogMixin(GMasterCommon):
entries.append(edct(ty, stat=st, entry=en, gfid=gfid, link=os.readlink(en)))
elif ty == 'RENAME':
e2 = unescape(os.path.join(pfx, ec[self.POS_ENTRY2]))
- entries.append(edct(ty, gfid=gfid, entry=en, entry1=e2))
+ entries.append(edct(ty, gfid=gfid, entry=en, entry1=e2, stat=st))
else:
pass
elif et in self.TYPE_GFID: