openstack/swift
Code Issues Proposed changes

Be more tolerant of exception messages from sqlite

Browse Source 
Parsing the text of error messages was always perilous, perhaps.
Either way, this should fix the problem of test_get() failing.

Change-Id: I929c2f6e60624241075a292d020c5707ea0ff1c3
This commit is contained in:
Pete Zaitcev 2017-10-18 18:15:11 -05:00
parent 0b15932227
commit 0bca0d4d2b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/db.py
View File

@ -333,7 +333,9 @@ class DatabaseBroker(object):
exc_hint = 'malformed'
elif 'malformed database schema' in str(exc_value):
exc_hint = 'malformed'
elif 'file is encrypted or is not a database' in str(exc_value):
elif ' is not a database' in str(exc_value):
# older versions said 'file is not a database'
# now 'file is encrypted or is not a database'
exc_hint = 'corrupted'
elif 'disk I/O error' in str(exc_value):
exc_hint = 'disk error while accessing'