From 71cb37b83abfce24e440ee87f960df234cad6366 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 2 Jan 2019 11:40:22 -0600 Subject: [PATCH] unittest_osdmap: feed options as defaults We can't change some of these at runtime due to FLAG_CREATE. Signed-off-by: Sage Weil --- src/test/osd/TestOSDMap.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc index e76f473149498..986278a5a0daf 100644 --- a/src/test/osd/TestOSDMap.cc +++ b/src/test/osd/TestOSDMap.cc @@ -13,15 +13,17 @@ using namespace std; int main(int argc, char **argv) { + map defaults = { + // make sure we have 3 copies, or some tests won't work + { "osd_pool_default_size", "3" }, + // our map is flat, so just try and split across OSDs, not hosts or whatever + { "osd_crush_chooseleaf_type", "0" }, + }; std::vector args(argv, argv+argc); - auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT, + auto cct = global_init(&defaults, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); - // make sure we have 3 copies, or some tests won't work - g_ceph_context->_conf.set_val("osd_pool_default_size", "3"); - // our map is flat, so just try and split across OSDs, not hosts or whatever - g_ceph_context->_conf.set_val("osd_crush_chooseleaf_type", "0"); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } -- 2.39.5