summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2015-03-18 19:50:03 +0530
committerVijay Bellur <vbellur@redhat.com>2015-03-18 21:22:55 -0700
commit2bf23b5b9be9ad600d71474a8f94b62765344b7c (patch)
tree088b5476c73e81ed4e38ca52325ca59eb38b465f
parent87a9d23627586a5d5cd8a502a08ecbdb6f0f7bb2 (diff)
geo-rep: Ignore .trashcan during xsync crawl.
With trash feature, .trashcan directory gets created at each export directory. Xsync picks .trashcan to sync and fails with EPERM. Xsync should ignore .trashcan directory. Change-Id: I45bd226c96011ace2c40dd2de878d886c7d34ce5 BUG: 1203293 Signed-off-by: Kotresh HR <khiremat@redhat.com> Reviewed-on: http://review.gluster.org/9934 Reviewed-by: Vijay Bellur <vbellur@redhat.com> Reviewed-by: Aravinda VK <avishwan@redhat.com> Reviewed-by: Venky Shankar <vshankar@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--geo-replication/syncdaemon/resource.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index ae94f04aa37..a4bec50b9ae 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -1234,6 +1234,7 @@ class GLUSTER(AbstractUrl, SlaveLocal, SlaveRemote):
if path == '.':
try:
e.remove('.glusterfs')
+ e.remove('.trashcan')
except ValueError:
pass
return e