Merge "Treat 404 as success when deleting segments"

This commit is contained in:
Zuul
2018-07-12 01:46:49 +00:00
committed by Gerrit Code Review

View File

@@ -2473,9 +2473,10 @@ class SwiftService(object):
def _delete_segment(conn, container, obj, results_queue=None): def _delete_segment(conn, container, obj, results_queue=None):
results_dict = {} results_dict = {}
try: try:
conn.delete_object(container, obj, response_dict=results_dict)
res = {'success': True} res = {'success': True}
conn.delete_object(container, obj, response_dict=results_dict)
except Exception as err: except Exception as err:
if not isinstance(err, ClientException) or err.http_status != 404:
traceback, err_time = report_traceback() traceback, err_time = report_traceback()
logger.exception(err) logger.exception(err)
res = { res = {