openstack/swift
Code Issues Proposed changes

Added timeout option to swift-recon

Browse Source 
Change-Id: I0d3c55a11c5e3252f0fd4b128ab840403c7f55f6
This commit is contained in:
gholt
2012-02-08 00:06:55 +00:00
parent e90424e88b
commit 0406323f9b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/swift-recon
View File

@@ -16,6 +16,7 @@ import os
VERBOSE = False VERBOSE = False
SUPPRESS_ERRORS = False SUPPRESS_ERRORS = False
TIMEOUT = 5
def get_devices(zone_filter, ring_file): def get_devices(zone_filter, ring_file):
@@ -32,7 +33,7 @@ def scout(base_url, recon_type):
global VERBOSE, SUPPRESS_ERRORS global VERBOSE, SUPPRESS_ERRORS
url = base_url + recon_type url = base_url + recon_type
try: try:
body = urllib2.urlopen(url).read() body = urllib2.urlopen(url, timeout=TIMEOUT).read()
content = json.loads(body) content = json.loads(body)
if VERBOSE: if VERBOSE:
print "-> %s: %s" % (url, content) print "-> %s: %s" % (url, content)
@@ -322,7 +323,7 @@ def disk_usage(hosts):
def main(): def main():
global VERBOSE, SUPPRESS_ERRORS, swift_dir, pool global VERBOSE, SUPPRESS_ERRORS, TIMEOUT, swift_dir, pool
print "=" * 79 print "=" * 79
usage = ''' usage = '''
usage: %prog [-v] [--suppress] [-a] [-r] [-u] [-d] [-l] [--objmd5] usage: %prog [-v] [--suppress] [-a] [-r] [-u] [-d] [-l] [--objmd5]
@@ -352,6 +353,8 @@ def main():
help="Perform all checks. Equivalent to -arudlq --objmd5 --sockstat") help="Perform all checks. Equivalent to -arudlq --objmd5 --sockstat")
args.add_option('--zone', '-z', type="int", args.add_option('--zone', '-z', type="int",
help="Only query servers in specified zone") help="Only query servers in specified zone")
args.add_option('--timeout', '-t', type="int", metavar="SECONDS",
help="Time to wait for a response from a server")
args.add_option('--swiftdir', default="/etc/swift", args.add_option('--swiftdir', default="/etc/swift",
help="Default = /etc/swift") help="Default = /etc/swift")
@@ -373,6 +376,9 @@ def main():
else: else:
hosts = get_devices(None, obj_ring) hosts = get_devices(None, obj_ring)
if options.timeout:
TIMEOUT = options.timeout
if options.all: if options.all:
async_check(hosts) async_check(hosts)
umount_check(hosts) umount_check(hosts)