]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Fix assert in set_cache_shards in bluestore fio 15659/head
authorlisali <xiaoyan.li@intel.com>
Tue, 13 Jun 2017 16:41:04 +0000 (12:41 -0400)
committerlisali <xiaoyan.li@intel.com>
Tue, 13 Jun 2017 16:41:04 +0000 (12:41 -0400)
The config osd_op_num_shards is changed so it needs to change in
fio_ceph_objectstore.cc.

Signed-off-by: Xiaoyan Li <xiaoyan.li@intel.com>
src/test/fio/fio_ceph_objectstore.cc

index c2be0d28d0cde9a3b94413e7a96054881a7c2729..cad2a8e5bb99a81c2799820696c247270269d953 100644 (file)
@@ -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)