summaryrefslogtreecommitdiffstats
path: root/geo-replication/syncdaemon/master.py
diff options
context:
space:
mode:
Diffstat (limited to 'geo-replication/syncdaemon/master.py')
-rw-r--r--geo-replication/syncdaemon/master.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
index b096bc77ebe..9724952fa70 100644
--- a/geo-replication/syncdaemon/master.py
+++ b/geo-replication/syncdaemon/master.py
@@ -849,6 +849,11 @@ class GMasterChangelogMixin(GMasterCommon):
# file got unlinked, May be historical Changelog
datas.remove(pt)
+ if ty in ['RMDIR'] and not isinstance(st, int):
+ logging.info(lf('Ignoring rmdir. Directory present in '
+ 'master', gfid=gfid, pgfid_bname=en))
+ continue
+
if not boolify(gconf.ignore_deletes):
if not ignore_entry_ops:
entries.append(edct(ty, gfid=gfid, entry=en))