From 1f42011a6a3188439f42ba924eb4380164adf515 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Thu, 19 Jul 2018 00:10:17 +0300 Subject: [PATCH 1/3] tests/fio: fix build failure Signed-off-by: Igor Fedotov --- src/test/fio/fio_ceph_objectstore.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/fio/fio_ceph_objectstore.cc b/src/test/fio/fio_ceph_objectstore.cc index 61c028aa4f9..d5925b53c2a 100644 --- a/src/test/fio/fio_ceph_objectstore.cc +++ b/src/test/fio/fio_ceph_objectstore.cc @@ -363,7 +363,7 @@ Engine::Engine(thread_data* td) // create shared collections up to osd_pool_default_pg_num if (o->single_pool_mode) { - uint64_t count = g_conf()->get_val("osd_pool_default_pg_num"); + uint64_t count = g_conf().get_val("osd_pool_default_pg_num"); if (count > td->o.nr_files) count = td->o.nr_files; init_collections(os, Collection::MIN_POOL_ID, collections, count); @@ -417,7 +417,7 @@ Job::Job(Engine* engine, const thread_data* td) std::vector* colls; // create private collections up to osd_pool_default_pg_num if (!o->single_pool_mode) { - uint64_t count = g_conf()->get_val("osd_pool_default_pg_num"); + uint64_t count = g_conf().get_val("osd_pool_default_pg_num"); if (count > td->o.nr_files) count = td->o.nr_files; // use the fio thread_number for our unique pool id From 25ff71813ce37c32d1b0c6608d20e64e8e84eb61 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Thu, 19 Jul 2018 00:46:04 +0300 Subject: [PATCH 2/3] tests/fio: add dependency for tests target from fio-ceph-objectstore plugin. This will make sure it's built by run-make-check.sh and hence avoid build failures after incomplete code updates. Signed-off-by: Igor Fedotov --- src/test/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index b5f1fc44af1..6ad9840ac05 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -572,6 +572,10 @@ endif(WITH_RBD) if(WITH_RADOSGW) add_dependencies(tests radosgw radosgw-admin) endif(WITH_RADOSGW) +#add dependency from fio just to ensure the plugin build isn't failing +if(WITH_FIO OR WITH_SYSTEM_FIO) + add_dependencies(tests fio_ceph_objectstore) +endif() if(WITH_RBD) add_ceph_test(run-rbd-unit-tests.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh) From ed00c25a6eca6ade1ec299b82fac7fc63efc5667 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 25 Jul 2018 22:47:18 +0800 Subject: [PATCH 3/3] cmake: sync up with upstream FIO to pick up the change to FTBFS with C++ engine. Signed-off-by: Kefu Chai --- cmake/modules/BuildFIO.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/BuildFIO.cmake b/cmake/modules/BuildFIO.cmake index fb504f4ab9d..31e44e08ba8 100644 --- a/cmake/modules/BuildFIO.cmake +++ b/cmake/modules/BuildFIO.cmake @@ -6,7 +6,7 @@ function(build_fio) DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/src/ UPDATE_COMMAND "" # this disables rebuild on each run GIT_REPOSITORY "https://github.com/axboe/fio.git" - GIT_TAG "540e235dcd276e63c57ca4bd35f70a0651e2d00e" + GIT_TAG "bf0b7e75c1ccca4026c8880ed8a76fc7ef85f2f3" SOURCE_DIR ${CMAKE_BINARY_DIR}/src/fio BUILD_IN_SOURCE 1 CONFIGURE_COMMAND /configure