From 8b41ad4af52ef1728df221dc506ef0ccd75472bb Mon Sep 17 00:00:00 2001
From: Aravinda VK <avishwan@redhat.com>
Date: Thu, 17 Nov 2016 17:07:36 +0530
Subject: [PATCH 199/206] geo-rep: Handle ENOENT during unlink

Do not raise traceback if a file/dir not exists during
unlink or rmdir

> Reviewed-on: http://review.gluster.org/15868
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Vijay Bellur <vbellur@redhat.com>

BUG: 1385589
Change-Id: Idd43ca1fa6ae6056c3cd493f0e2f151880a3968c
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/91363
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 geo-replication/syncdaemon/resource.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index f3ce463..998fe27 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -782,11 +782,13 @@ class Server(object):
                         if st.st_ino == st1.st_ino:
                             # we have a hard link, we can now unlink source
                             try:
-                                os.unlink(entry)
+                                errno_wrap(os.unlink, [entry],
+                                           [ENOENT, ESTALE])
                             except OSError as e:
                                 if e.errno == EISDIR:
                                     try:
-                                        os.rmdir(entry)
+                                        errno_wrap(os.rmdir, [entry],
+                                                   [ENOENT, ESTALE])
                                     except OSError as e:
                                         if e.errno == ENOTEMPTY:
                                             logging.error(
-- 
2.9.3