openstack/swift
Code Issues Proposed changes

Ignore ENOENT and ENOTEMPTY errors in delete_partition

Browse Source 
This is comparable to the error handling we have in delete_handoff_objs.

Change-Id: I08bda9bcfeb60b3c5654322a9e6139a8ac5b3391
This commit is contained in:
Tim Burke 2018-09-28 13:02:03 -07:00
parent 07e25b8698
commit 93fb77e8af
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swift/obj/replicator.py
View File

@ -576,7 +576,12 @@ class ObjectReplicator(Daemon):
def delete_partition(self, path):
self.logger.info(_("Removing partition: %s"), path)
tpool.execute(shutil.rmtree, path)
try:
tpool.execute(shutil.rmtree, path)
except OSError as e:
if e.errno not in (errno.ENOENT, errno.ENOTEMPTY):
# If there was a race to create or delete, don't worry
raise
def delete_handoff_objs(self, job, delete_objs):
success_paths = []