Merge "swift-[account|container]-info when disk is full"

openstack/swift

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2016年04月22日 17:31:08 +00:00

committed by Gerrit Code Review

parent 72372c1464 e97c4f794d

commit 60c127575b

6 changed files with 164 additions and 35 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

21
bin/swift-account-info

View File

@@ -11,12 +11,28 @@

# License for the specific language governing permissions and limitations

# under the License.

import sqlite3

import sys

from optparse import OptionParser

from swift.cli.info import print_info, InfoSystemExit

def run_print_info(args, opts):

try:

print_info('account', *args, **opts)

except InfoSystemExit:

sys.exit(1)

except sqlite3.OperationalError as e:

if not opts.get('stale_reads_ok'):

opts['stale_reads_ok'] = True

print('Warning: Possibly Stale Data')

run_print_info(args, opts)

sys.exit(2)

else:

print('Account info failed: %s' % e)

sys.exit(1)

if __name__ == '__main__':

parser = OptionParser('%prog [options] ACCOUNT_DB_FILE')

parser.add_option(

@@ -28,7 +44,4 @@ if __name__ == '__main__':

if len(args) != 1:

sys.exit(parser.print_help())

try:

print_info('account', *args, **vars(options))

except InfoSystemExit:

sys.exit(1)

run_print_info(args, vars(options))

21
bin/swift-container-info

View File

@@ -11,12 +11,28 @@

# License for the specific language governing permissions and limitations

# under the License.

import sqlite3

import sys

from optparse import OptionParser

from swift.cli.info import print_info, InfoSystemExit

def run_print_info(args, opts):

try:

print_info('container', *args, **opts)

except InfoSystemExit:

sys.exit(1)

except sqlite3.OperationalError as e:

if not opts.get('stale_reads_ok'):

opts['stale_reads_ok'] = True

print('Warning: Possibly Stale Data')

run_print_info(args, opts)

sys.exit(2)

else:

print('Container info failed: %s' % e)

sys.exit(1)

if __name__ == '__main__':

parser = OptionParser('%prog [options] CONTAINER_DB_FILE')

parser.add_option(

@@ -28,7 +44,4 @@ if __name__ == '__main__':

if len(args) != 1:

sys.exit(parser.print_help())

try:

print_info('container', *args, **vars(options))

except InfoSystemExit:

sys.exit(1)

run_print_info(args, vars(options))