openstack/swift
Code Issues Proposed changes

Merge "Allow floating point value for dispersion_coverage"

Browse Source
This commit is contained in:
Jenkins 2013-07-29 21:53:19 +00:00 committed by Gerrit Code Review
commit 82aeacf5bf
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/swift-dispersion-populate
View File

@ -87,7 +87,7 @@ if __name__ == '__main__':
exit('Unable to read config file: %s' % conffile) exit('Unable to read config file: %s' % conffile)
conf = dict(c.items('dispersion')) conf = dict(c.items('dispersion'))
swift_dir = conf.get('swift_dir', '/etc/swift') swift_dir = conf.get('swift_dir', '/etc/swift')
dispersion_coverage = int(conf.get('dispersion_coverage', 1)) dispersion_coverage = float(conf.get('dispersion_coverage', 1))
retries = int(conf.get('retries', 5)) retries = int(conf.get('retries', 5))
concurrency = int(conf.get('concurrency', 25)) concurrency = int(conf.get('concurrency', 25))
endpoint_type = str(conf.get('endpoint_type', 'publicURL')) endpoint_type = str(conf.get('endpoint_type', 'publicURL'))

1
bin/swift-dispersion-report
View File

@ -324,7 +324,6 @@ Usage: %%prog [options] [conf_file]
exit('Unable to read config file: %s' % conffile) exit('Unable to read config file: %s' % conffile)
conf = dict(c.items('dispersion')) conf = dict(c.items('dispersion'))
swift_dir = conf.get('swift_dir', '/etc/swift') swift_dir = conf.get('swift_dir', '/etc/swift')
dispersion_coverage = int(conf.get('dispersion_coverage', 1))
retries = int(conf.get('retries', 5)) retries = int(conf.get('retries', 5))
concurrency = int(conf.get('concurrency', 25)) concurrency = int(conf.get('concurrency', 25))
endpoint_type = str(conf.get('endpoint_type', 'publicURL')) endpoint_type = str(conf.get('endpoint_type', 'publicURL'))

4
doc/manpages/dispersion.conf.5
View File

@ -47,7 +47,7 @@ Authentication system account/user password
.IP "\fBswift_dir\fR" .IP "\fBswift_dir\fR"
Location of openstack-swift configuration and ring files Location of openstack-swift configuration and ring files
.IP "\fBdispersion_coverage\fR" .IP "\fBdispersion_coverage\fR"
Percentage of partition coverage to use. The default is 1. Percentage of partition coverage to use. The default is 1.0.
.IP "\fBretries\fR" .IP "\fBretries\fR"
Maximum number of attempts Maximum number of attempts
.IP "\fBconcurrency\fR" .IP "\fBconcurrency\fR"
@ -69,7 +69,7 @@ Whether to run the object report. The default is yes.
.IP "auth_user = dpstats:dpstats" .IP "auth_user = dpstats:dpstats"
.IP "auth_key = dpstats" .IP "auth_key = dpstats"
.IP "swift_dir = /etc/swift" .IP "swift_dir = /etc/swift"
.IP "# dispersion_coverage = 1" .IP "# dispersion_coverage = 1.0"
.IP "# retries = 5" .IP "# retries = 5"
.IP "# concurrency = 25" .IP "# concurrency = 25"
.IP "# dump_json = no" .IP "# dump_json = no"

2
doc/manpages/swift-dispersion-populate.1
View File

@ -66,7 +66,7 @@ Example \fI/etc/swift/dispersion.conf\fR:
.IP "auth_user = dpstats:dpstats" .IP "auth_user = dpstats:dpstats"
.IP "auth_key = dpstats" .IP "auth_key = dpstats"
.IP "swift_dir = /etc/swift" .IP "swift_dir = /etc/swift"
.IP "# dispersion_coverage = 1" .IP "# dispersion_coverage = 1.0"
.IP "# retries = 5" .IP "# retries = 5"
.IP "# concurrency = 25" .IP "# concurrency = 25"
.IP "# endpoint_type = publicURL" .IP "# endpoint_type = publicURL"

2
doc/manpages/swift-dispersion-report.1
View File

@ -94,7 +94,7 @@ Example \fI/etc/swift/dispersion.conf\fR:
.IP "auth_user = dpstats:dpstats" .IP "auth_user = dpstats:dpstats"
.IP "auth_key = dpstats" .IP "auth_key = dpstats"
.IP "swift_dir = /etc/swift" .IP "swift_dir = /etc/swift"
.IP "# dispersion_coverage = 1" .IP "# dispersion_coverage = 1.0"
.IP "# retries = 5" .IP "# retries = 5"
.IP "# concurrency = 25" .IP "# concurrency = 25"
.IP "# dump_json = no" .IP "# dump_json = no"

2
etc/dispersion.conf-sample
View File

@ -9,7 +9,7 @@ auth_key = testing
# endpoint_type = publicURL # endpoint_type = publicURL
# #
# swift_dir = /etc/swift # swift_dir = /etc/swift
# dispersion_coverage = 1 # dispersion_coverage = 1.0
# retries = 5 # retries = 5
# concurrency = 25 # concurrency = 25
# container_report = yes # container_report = yes