Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug in aerospike #367

Merged
merged 1 commit into from
Jul 7, 2015
Merged

Fix bug in aerospike #367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions perfkitbenchmarker/benchmarks/aerospike_benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@

This test can be run in a variety of configurations including memory only,
remote/persistent ssd, and local ssd. The Aerospike configuration is controlled
by the "aerospike_storage_type", "scratch_disk_type", and "use_local_disk"
flags.
by the "aerospike_storage_type" and "scratch_disk_type" flags.
"""

import re
Expand All @@ -40,8 +39,7 @@
DISK = 'disk'
flags.DEFINE_enum('aerospike_storage_type', MEMORY, [MEMORY, DISK],
'The type of storage to use for Aerospike data. The type of '
'disk is controlled by a combination of the '
'"scratch_disk_type" and "use_local_disk" flags.')
'disk is controlled by the "scratch_disk_type" flag.')

BENCHMARK_INFO = {'name': 'aerospike',
'description': 'Runs Aerospike',
Expand Down Expand Up @@ -192,8 +190,6 @@ def ParseOutput(output):
'Client Threads': threads,
'Storage Type': FLAGS.aerospike_storage_type,
}
if FLAGS.aerospike_storage_type == DISK:
metadata['Disk Type'] = 'Local' if FLAGS.use_local_disk else 'Remote'
samples.append(sample.Sample('Average Latency', latency, 'ms', metadata))
if latency < 1.0:
max_throughput_for_completion_latency_under_1ms = max(
Expand Down