Skip to content

Commit

Permalink
Rename rand_readwrite to readwrite.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Tommi Virtanen committed Jul 26, 2011
1 parent e17c56a commit 7a98a49
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion config.yaml.SAMPLE
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions s3tests/rand_readwrite.py → s3tests/readwrite.py
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -22,7 +22,7 @@
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',
], ],
}, },
Expand Down

0 comments on commit 7a98a49

Please sign in to comment.