openstack/python-swiftclient
Code Issues Proposed changes

Merge "Treat 404 as success when deleting segments"

Browse Source
This commit is contained in:
Zuul 2018-07-12 01:46:49 +00:00 committed by Gerrit Code Review
commit 25e23988b3
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
swiftclient/service.py
View File

@ -2473,17 +2473,18 @@ 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:
traceback, err_time = report_traceback() if not isinstance(err, ClientException) or err.http_status != 404:
logger.exception(err) traceback, err_time = report_traceback()
res = { logger.exception(err)
'success': False, res = {
'error': err, 'success': False,
'traceback': traceback, 'error': err,
'error_timestamp': err_time 'traceback': traceback,
} 'error_timestamp': err_time
}
res.update({ res.update({
'action': 'delete_segment', 'action': 'delete_segment',