openstack/swift
Code Issues Proposed changes

Compare Swift config checksum in swift-recon --all

Browse Source 
Change-Id: I796fe0895f4e5ddeb04c0d79a73579ce8bb9aa40
This commit is contained in:
Ondřej Nový 2015-11-01 18:10:06 +01:00
parent 5f23d0617f
commit e0430fc74a
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/manpages/swift-recon.1
View File

@ -83,7 +83,9 @@ Get drive audit error stats
.IP "\fB-T, --time\fR" .IP "\fB-T, --time\fR"
Check time synchronization Check time synchronization
.IP "\fB--all\fR" .IP "\fB--all\fR"
Perform all checks. Equivalent to \-arudlqT \-\-md5 Perform all checks. Equivalent to \-arudlqT
\-\-md5 \-\-sockstat \-\-auditor \-\-updater \-\-expirer
\-\-driveaudit \-\-validate\-servers
.IP "\fB--region=REGION\fR" .IP "\fB--region=REGION\fR"
Only query servers in specified region Only query servers in specified region
.IP "\fB-z ZONE, --zone=ZONE\fR" .IP "\fB-z ZONE, --zone=ZONE\fR"

4
doc/source/admin_guide.rst
View File

@ -589,7 +589,9 @@ This information can also be queried via the swift-recon command line utility::
--md5 Get md5sum of servers ring and compare to local copy --md5 Get md5sum of servers ring and compare to local copy
--sockstat Get cluster socket usage stats --sockstat Get cluster socket usage stats
-T, --time Check time synchronization -T, --time Check time synchronization
--all Perform all checks. Equal to -arudlqT --md5 --sockstat --all Perform all checks. Equal to
-arudlqT --md5 --sockstat --auditor --updater
--expirer --driveaudit --validate-servers
-z ZONE, --zone=ZONE Only query servers in specified zone -z ZONE, --zone=ZONE Only query servers in specified zone
-t SECONDS, --timeout=SECONDS -t SECONDS, --timeout=SECONDS
Time to wait for a response from a server Time to wait for a response from a server

8
swift/cli/recon.py
View File

@ -978,7 +978,8 @@ class SwiftRecon(object):
order.') order.')
args.add_option('--all', action="store_true", args.add_option('--all', action="store_true",
help="Perform all checks. Equal to \t\t\t-arudlqT " help="Perform all checks. Equal to \t\t\t-arudlqT "
"--md5 --sockstat --auditor --updater --expirer") "--md5 --sockstat --auditor --updater --expirer "
"--driveaudit --validate-servers")
args.add_option('--region', type="int", args.add_option('--region', type="int",
help="Only query servers in specified region") help="Only query servers in specified region")
args.add_option('--zone', '-z', type="int", args.add_option('--zone', '-z', type="int",
@ -1018,22 +1019,21 @@ class SwiftRecon(object):
if options.all: if options.all:
if self.server_type == 'object': if self.server_type == 'object':
self.async_check(hosts) self.async_check(hosts)
self.replication_check(hosts)
self.object_auditor_check(hosts) self.object_auditor_check(hosts)
self.updater_check(hosts) self.updater_check(hosts)
self.expirer_check(hosts) self.expirer_check(hosts)
elif self.server_type == 'container': elif self.server_type == 'container':
self.replication_check(hosts)
self.auditor_check(hosts) self.auditor_check(hosts)
self.updater_check(hosts) self.updater_check(hosts)
elif self.server_type == 'account': elif self.server_type == 'account':
self.replication_check(hosts)
self.auditor_check(hosts) self.auditor_check(hosts)
self.replication_check(hosts)
self.umount_check(hosts) self.umount_check(hosts)
self.load_check(hosts) self.load_check(hosts)
self.disk_usage(hosts, options.top, options.lowest, self.disk_usage(hosts, options.top, options.lowest,
options.human_readable) options.human_readable)
self.get_ringmd5(hosts, swift_dir) self.get_ringmd5(hosts, swift_dir)
self.get_swiftconfmd5(hosts)
self.quarantine_check(hosts) self.quarantine_check(hosts)
self.socket_usage(hosts) self.socket_usage(hosts)
self.server_type_check(hosts) self.server_type_check(hosts)