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

Some minor bug fixes to make librbdfio and radosbench work for Luminous #142

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Some minor bug fixes to make librbdfio and radosbench work for Luminous #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ee9ab
radosbench.py: add missing %s to the pool name template
Jeegn-Chen Feb 11, 2018
4df12b1
ceph.py: use status command instead of health in check_health
Jeegn-Chen Feb 11, 2018
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
2 changes: 1 addition & 1 deletion benchmark/radosbench.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def _run(self, mode, run_dir, out_dir):

run_name = '--run-name %s`%s`-%s'%(self.object_set_id, common.get_fqdn_cmd(), i)
if self.pool_per_proc: # support previous behavior of 1 storage pool per rados process
pool_name = 'rados-bench-``-%s'% (common.get_fqdn_cmd(), i)
pool_name = 'rados-bench-`%s`-%s'% (common.get_fqdn_cmd(), i)
run_name = ''
rados_bench_cmd = '%s -c %s -p %s bench %s %s %s %s %s %s %s --no-cleanup 2> %s > %s' % \
(self.cmd_path_full, self.tmp_conf, pool_name, op_size_str, self.time, mode, concurrent_ops_str, max_objects_str, write_omap_str, run_name, objecter_log, out_file)
Expand Down
2 changes: 1 addition & 1 deletion cluster/ceph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ def check_health(self, check_list=None, logfile=None):
# Match any of these things to continue checking health
check_list = ["degraded", "peering", "recovery_wait", "stuck", "inactive", "unclean", "recovery", "stale"]
while True:
stdout, stderr = common.pdsh(settings.getnodes('head'), '%s -c %s health %s' % (self.ceph_cmd, self.tmp_conf, logline)).communicate()
stdout, stderr = common.pdsh(settings.getnodes('head'), '%s -c %s status %s' % (self.ceph_cmd, self.tmp_conf, logline)).communicate()
if check_list and not any(x in stdout for x in check_list):
break
if "HEALTH_OK" in stdout:
Expand Down