RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-05 18:03:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23231 from tchaikov/wip-fio

Browse Source 
tests/fio: fix build failures and ensure this is covered by run-make-check.sh

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
This commit is contained in:
Kefu Chai 2018-07-26 00:11:29 +08:00 committed by GitHub
commit 094b9fdbef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/BuildFIO.cmake
View File

@ -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 <SOURCE_DIR>/configure

4
src/test/CMakeLists.txt
View File

@ -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)

4
src/test/fio/fio_ceph_objectstore.cc
View File

@ -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<uint64_t>("osd_pool_default_pg_num");
uint64_t count = g_conf().get_val<uint64_t>("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<Collection>* colls;
// create private collections up to osd_pool_default_pg_num
if (!o->single_pool_mode) {
uint64_t count = g_conf()->get_val<uint64_t>("osd_pool_default_pg_num");
uint64_t count = g_conf().get_val<uint64_t>("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