dkirillov/s3-tests
1
0
Fork 0
forked from TrueCloudLab/s3-tests
Code Pull requests Activity

pep8 cleanup.

Browse source
This commit is contained in:
Tommi Virtanen 2011-07-19 09:09:51 -07:00
parent e0575e4efe
commit fe749adebf
6 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
s3tests/common/__init__.py
View file

@ -181,4 +181,3 @@ def fill_pools(*args):
def get_next_key(bucket=None): def get_next_key(bucket=None):
return bucket.new_key("seqkey-{num}".format(num=next(key_counter))) return bucket.new_key("seqkey-{num}".format(num=next(key_counter)))

1
s3tests/common/results.py
View file

@ -108,4 +108,3 @@ class ResultsLogger(gevent.Greenlet):
result = context.result_queue.popleft() result = context.result_queue.popleft()
yrep = yaml.dump(result) yrep = yaml.dump(result)
self.outfile.write(yrep + "---\n") self.outfile.write(yrep + "---\n")

14
s3tests/rand_readwrite.py
View file

@ -44,7 +44,7 @@ class Result:
size=self.size, size=self.size,
time=self.time, time=self.time,
mbps=mbps, mbps=mbps,
details=self.details details=self.details,
) )
def reader(seconds, bucket, name=None, queue=None): def reader(seconds, bucket, name=None, queue=None):
@ -144,11 +144,11 @@ def main():
file_size=options.file_size, file_size=options.file_size,
file_stddev=options.stddev, file_stddev=options.stddev,
quantity=options.quantity, quantity=options.quantity,
file_name_seed=r file_name_seed=r,
) for x in xrange(options.num_writers)] ) for x in xrange(options.num_writers)]
greenlets += [gevent.spawn(reader, options.duration, bucket, greenlets += [gevent.spawn(reader, options.duration, bucket,
name=x, name=x,
queue=q queue=q,
) for x in xrange(options.num_readers)] ) for x in xrange(options.num_readers)]
gevent.spawn_later(options.duration, lambda: q.put(StopIteration)) gevent.spawn_later(options.duration, lambda: q.put(StopIteration))
@ -177,19 +177,19 @@ def main():
print "--- Stats ---" print "--- Stats ---"
print "Total Read: {read} MB ({mbps} MB/s)".format( print "Total Read: {read} MB ({mbps} MB/s)".format(
read=(total_read/1024.0), read=(total_read/1024.0),
mbps=(total_read/1024.0/options.duration) mbps=(total_read/1024.0/options.duration),
) )
print "Total Write: {write} MB ({mbps} MB/s)".format( print "Total Write: {write} MB ({mbps} MB/s)".format(
write=(total_write/1024.0), write=(total_write/1024.0),
mbps=(total_write/1024.0/options.duration) mbps=(total_write/1024.0/options.duration),
) )
print "Read filures: {num} ({percent}%)".format( print "Read filures: {num} ({percent}%)".format(
num=read_failure, num=read_failure,
percent=(100.0*read_failure/max(read_failure+read_success, 1)) percent=(100.0*read_failure/max(read_failure+read_success, 1)),
) )
print "Write failures: {num} ({percent}%)".format( print "Write failures: {num} ({percent}%)".format(
num=write_failure, num=write_failure,
percent=(100.0*write_failure/max(write_failure+write_success, 1)) percent=(100.0*write_failure/max(write_failure+write_success, 1)),
) )
gevent.joinall(greenlets, timeout=1) gevent.joinall(greenlets, timeout=1)

6
s3tests/realistic.py
View file

@ -165,13 +165,13 @@ def files_varied(groups, unlimited=False):
# Build the sets for our yield # Build the sets for our yield
for num, size, stddev in groups: for num, size, stddev in groups:
assert num and size assert num and size #TODO
file_sets.append(bunch.Bunch( file_sets.append(bunch.Bunch(
num = num, num = num,
size = size, size = size,
stddev = stddev, stddev = stddev,
files = files(size, stddev, time.time()) files = files(size, stddev, time.time()),
)) ))
total_num += num total_num += num
@ -199,4 +199,4 @@ def files_varied(groups, unlimited=False):
yield next(file_set.files) yield next(file_set.files)
if not ok: if not ok:
raise RuntimeError, "Couldn't find a match." raise RuntimeError("Couldn't find a match.")