mirror of
https://github.com/ceph/s3-tests.git
synced 2024-11-25 13:47:27 +00:00
Rename rand_readwrite to readwrite.
Simpler, and all the benchmarks are pretty much as pseudorandom, in the end; that's not a relevant characteristic. The mix of read and write operations is. Re-run ./bootstrap to get the s3tests-test-readwrite script regenerated to refer to the new module name.
This commit is contained in:
parent
e17c56a714
commit
7a98a496e4
3 changed files with 7 additions and 7 deletions
|
@ -17,7 +17,7 @@ file_generation:
|
||||||
## single bucket for a set duration.
|
## single bucket for a set duration.
|
||||||
## Note: the readwrite tool does not need the s3.alt connection info.
|
## Note: the readwrite tool does not need the s3.alt connection info.
|
||||||
## only s3.main is used.
|
## only s3.main is used.
|
||||||
rand_readwrite:
|
readwrite:
|
||||||
## The number of reader and writer worker threads. This sets how many
|
## The number of reader and writer worker threads. This sets how many
|
||||||
## files will be read and written concurrently.
|
## files will be read and written concurrently.
|
||||||
readers: 2
|
readers: 2
|
||||||
|
|
|
@ -134,15 +134,15 @@ def main():
|
||||||
common.setup()
|
common.setup()
|
||||||
|
|
||||||
# verify all required config items are present
|
# verify all required config items are present
|
||||||
if 'rand_readwrite' not in common.config:
|
if 'readwrite' not in common.config:
|
||||||
raise RuntimeError('rand_readwrite section not found in config')
|
raise RuntimeError('readwrite section not found in config')
|
||||||
config = common.config.rand_readwrite
|
config = common.config.readwrite
|
||||||
for item in ['readers', 'writers', 'duration', 'files']:
|
for item in ['readers', 'writers', 'duration', 'files']:
|
||||||
if item not in config:
|
if item not in config:
|
||||||
raise RuntimeError("Missing rand_readwrite config item: {item}".format(item=item))
|
raise RuntimeError("Missing readwrite config item: {item}".format(item=item))
|
||||||
for item in ['num', 'size', 'stddev']:
|
for item in ['num', 'size', 'stddev']:
|
||||||
if item not in config.files:
|
if item not in config.files:
|
||||||
raise RuntimeError("Missing rand_readwrite config item: files.{item}".format(item=item))
|
raise RuntimeError("Missing readwrite config item: files.{item}".format(item=item))
|
||||||
|
|
||||||
# setup bucket and other objects
|
# setup bucket and other objects
|
||||||
bucket = common.get_new_bucket()
|
bucket = common.get_new_bucket()
|
2
setup.py
2
setup.py
|
@ -22,7 +22,7 @@ setup(
|
||||||
entry_points={
|
entry_points={
|
||||||
'console_scripts': [
|
'console_scripts': [
|
||||||
's3tests-generate-objects = s3tests.generate_objects:main',
|
's3tests-generate-objects = s3tests.generate_objects:main',
|
||||||
's3tests-test-readwrite = s3tests.rand_readwrite:main',
|
's3tests-test-readwrite = s3tests.readwrite:main',
|
||||||
's3tests-test-roundtrip = s3tests.roundtrip:main',
|
's3tests-test-roundtrip = s3tests.roundtrip:main',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue