openstack/swift
Code Issues Proposed changes

Merge "swift-(account|container)-info: tolerate LockTimeouts"

Browse Source
This commit is contained in:
Zuul 2018-04-11 07:24:53 +00:00 committed by Gerrit Code Review
commit c9ddee7aac
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/swift-account-info
View File

@ -16,6 +16,7 @@ import sys
from optparse import OptionParser
from swift.cli.info import print_info, InfoSystemExit
from swift.common.exceptions import LockTimeout
def run_print_info(args, opts):
@ -23,7 +24,7 @@ def run_print_info(args, opts):
print_info('account', *args, **opts)
except InfoSystemExit:
sys.exit(1)
except sqlite3.OperationalError as e:
except (sqlite3.OperationalError, LockTimeout) as e:
if not opts.get('stale_reads_ok'):
opts['stale_reads_ok'] = True
print('Warning: Possibly Stale Data')

3
bin/swift-container-info
View File

@ -16,6 +16,7 @@ import sys
from optparse import OptionParser
from swift.cli.info import print_info, InfoSystemExit
from swift.common.exceptions import LockTimeout
def run_print_info(args, opts):
@ -23,7 +24,7 @@ def run_print_info(args, opts):
print_info('container', *args, **opts)
except InfoSystemExit:
sys.exit(1)
except sqlite3.OperationalError as e:
except (sqlite3.OperationalError, LockTimeout) as e:
if not opts.get('stale_reads_ok'):
opts['stale_reads_ok'] = True
print('Warning: Possibly Stale Data')