openstack/swift
Code Issues Proposed changes

Merge "Ignore ENOENT and ENOTEMPTY errors in delete_partition"

Browse Source
This commit is contained in:
Zuul
2018-12-11 22:20:16 +00:00
committed by Gerrit Code Review
parent 3272f2ec2f 93fb77e8af
commit f7ca182f40
1 changed files with 6 additions and 1 deletions
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): def delete_partition(self, path):
self.logger.info(_("Removing partition: %s"), 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): def delete_handoff_objs(self, job, delete_objs):
success_paths = [] success_paths = []