From 21fc54b11b6caa37bf932b264c895294daa1afcb Mon Sep 17 00:00:00 2001 From: lisali Date: Tue, 13 Jun 2017 12:41:04 -0400 Subject: [PATCH] Fix assert in set_cache_shards in bluestore fio The config osd_op_num_shards is changed so it needs to change in fio_ceph_objectstore.cc. Signed-off-by: Xiaoyan Li --- src/test/fio/fio_ceph_objectstore.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/test/fio/fio_ceph_objectstore.cc b/src/test/fio/fio_ceph_objectstore.cc index c2be0d28d0cde..cad2a8e5bb99a 100644 --- a/src/test/fio/fio_ceph_objectstore.cc +++ b/src/test/fio/fio_ceph_objectstore.cc @@ -124,7 +124,14 @@ Engine::Engine(const thread_data* td) : ref_count(0) if (!os) throw std::runtime_error("bad objectstore type " + g_conf->osd_objectstore); - os->set_cache_shards(g_conf->osd_op_num_shards); + unsigned num_shards; + if(g_conf->osd_op_num_shards) + num_shards = g_conf->osd_op_num_shards; + else if(os->is_rotational()) + num_shards = g_conf->osd_op_num_shards_hdd; + else + num_shards = g_conf->osd_op_num_shards_ssd; + os->set_cache_shards(num_shards); int r = os->mkfs(); if (r < 0) -- 2.39.5