openstack/swift
Code Issues Proposed changes

Merge "Be more tolerant of exception messages from sqlite"

Browse Source
This commit is contained in:
Zuul
2017-10-19 08:17:56 +00:00
committed by Gerrit Code Review
parent 0621e0cf3d 0bca0d4d2b
commit c5a84b4d79
1 changed files with 3 additions and 1 deletions
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' exc_hint = 'malformed'
elif 'malformed database schema' in str(exc_value): elif 'malformed database schema' in str(exc_value):
exc_hint = 'malformed' 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' exc_hint = 'corrupted'
elif 'disk I/O error' in str(exc_value): elif 'disk I/O error' in str(exc_value):
exc_hint = 'disk error while accessing' exc_hint = 'disk error while accessing'