From: Sage Weil Date: Wed, 10 Jan 2018 22:43:04 +0000 (-0600) Subject: test: CINIT_FLAG_NO_MON_CONFIG or NO_DEFAULT_CONFIG_FILE X-Git-Tag: v13.0.2~78^2~70 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6eb8f30a238f8a0a546ddbab3536ff08d158155e;p=ceph.git test: CINIT_FLAG_NO_MON_CONFIG or NO_DEFAULT_CONFIG_FILE Usually we use NO_DEFAULT_CONFIG_FILE, but for those tests that need the plugin directory overrides in order to work properly when run manually (e.g., "bin/unittest_compression"), read the config and only skip the mon config. The NO_DFEAULT_CONFIG_FILE (which also skips the mon) would work for everything when run via ctest, but as a dev one often runs the unittest manually and having to pass CEPH_LIB=lib is annoying. Note that do_cmake.sh already writes out a trivial ceph.conf with these options set for us. Signed-off-by: Sage Weil --- diff --git a/src/log/test.cc b/src/log/test.cc index b25ec41e3b7b..fae67e964fc8 100644 --- a/src/log/test.cc +++ b/src/log/test.cc @@ -395,7 +395,8 @@ int main(int argc, char **argv) argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/ObjectMap/test_keyvaluedb_iterators.cc b/src/test/ObjectMap/test_keyvaluedb_iterators.cc index e35f085fcafd..d041230cb25f 100644 --- a/src/test/ObjectMap/test_keyvaluedb_iterators.cc +++ b/src/test/ObjectMap/test_keyvaluedb_iterators.cc @@ -1743,7 +1743,7 @@ int main(int argc, char *argv[]) vector args; argv_to_vec(argc, (const char **) argv, args); - auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); + auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/ObjectMap/test_object_map.cc b/src/test/ObjectMap/test_object_map.cc index 8d3f6882c93c..d194db1865c3 100644 --- a/src/test/ObjectMap/test_object_map.cc +++ b/src/test/ObjectMap/test_object_map.cc @@ -665,7 +665,8 @@ int main(int argc, char **argv) { argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/src/test/TestSignalHandlers.cc b/src/test/TestSignalHandlers.cc index 1f5ff46e257e..1f24c8f96405 100644 --- a/src/test/TestSignalHandlers.cc +++ b/src/test/TestSignalHandlers.cc @@ -80,7 +80,8 @@ int main(int argc, const char **argv) argv_to_vec(argc, argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); test_fn_t fn = NULL; diff --git a/src/test/TestTimers.cc b/src/test/TestTimers.cc index edf4efc9c549..cf6ef4b5e79e 100644 --- a/src/test/TestTimers.cc +++ b/src/test/TestTimers.cc @@ -255,7 +255,8 @@ int main(int argc, const char **argv) argv_to_vec(argc, argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); int ret; diff --git a/src/test/bench_log.cc b/src/test/bench_log.cc index 36761841cad4..2acbf1de48d8 100644 --- a/src/test/bench_log.cc +++ b/src/test/bench_log.cc @@ -41,7 +41,8 @@ int main(int argc, const char **argv) argv_to_vec(argc, argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_OSD, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); utime_t start = ceph_clock_now(); diff --git a/src/test/common/get_command_descriptions.cc b/src/test/common/get_command_descriptions.cc index 93a8e842d3bf..2ba014d46b28 100644 --- a/src/test/common/get_command_descriptions.cc +++ b/src/test/common/get_command_descriptions.cc @@ -98,7 +98,8 @@ int main(int argc, char **argv) { argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); if (args.empty()) { diff --git a/src/test/crush/CrushWrapper.cc b/src/test/crush/CrushWrapper.cc index aebfba4305fa..ec240823b956 100644 --- a/src/test/crush/CrushWrapper.cc +++ b/src/test/crush/CrushWrapper.cc @@ -1426,7 +1426,8 @@ int main(int argc, char **argv) { { "debug_crush", "0" } }; auto cct = global_init(&defaults, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/src/test/direct_messenger/test_direct_messenger.cc b/src/test/direct_messenger/test_direct_messenger.cc index fab0f62d515d..2789e4227780 100644 --- a/src/test/direct_messenger/test_direct_messenger.cc +++ b/src/test/direct_messenger/test_direct_messenger.cc @@ -428,7 +428,8 @@ int main(int argc, char **argv) argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_ANY, - CODE_ENVIRONMENT_DAEMON, 0); + CODE_ENVIRONMENT_DAEMON, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(cct.get()); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodeShec_all.cc b/src/test/erasure-code/TestErasureCodeShec_all.cc index b6950cbcceb2..c52571302135 100644 --- a/src/test/erasure-code/TestErasureCodeShec_all.cc +++ b/src/test/erasure-code/TestErasureCodeShec_all.cc @@ -295,7 +295,8 @@ int main(int argc, char **argv) argv_to_vec(argc, (const char **) argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_MON_CONFIG); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodeShec_arguments.cc b/src/test/erasure-code/TestErasureCodeShec_arguments.cc index dffe0aad3368..f01db75ed23a 100644 --- a/src/test/erasure-code/TestErasureCodeShec_arguments.cc +++ b/src/test/erasure-code/TestErasureCodeShec_arguments.cc @@ -396,7 +396,8 @@ int main(int argc, char **argv) argv_to_vec(argc, (const char **) argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_MON_CONFIG); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/ceph_erasure_code.cc b/src/test/erasure-code/ceph_erasure_code.cc index 0c5767173660..738f05a4782e 100644 --- a/src/test/erasure-code/ceph_erasure_code.cc +++ b/src/test/erasure-code/ceph_erasure_code.cc @@ -86,7 +86,7 @@ int ErasureCodeCommand::setup(int argc, char** argv) { cct = global_init( NULL, ceph_options, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, - CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); + CINIT_FLAG_NO_MON_CONFIG); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); diff --git a/src/test/erasure-code/ceph_erasure_code_non_regression.cc b/src/test/erasure-code/ceph_erasure_code_non_regression.cc index 8e497196d03e..3fd7beccd9d2 100644 --- a/src/test/erasure-code/ceph_erasure_code_non_regression.cc +++ b/src/test/erasure-code/ceph_erasure_code_non_regression.cc @@ -93,7 +93,7 @@ int ErasureCodeNonRegression::setup(int argc, char** argv) { cct = global_init(NULL, ceph_options, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, - CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); + CINIT_FLAG_NO_MON_CONFIG); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); diff --git a/src/test/filestore/TestFileStore.cc b/src/test/filestore/TestFileStore.cc index 8cc6665394eb..bf1026d74550 100644 --- a/src/test/filestore/TestFileStore.cc +++ b/src/test/filestore/TestFileStore.cc @@ -69,7 +69,8 @@ int main(int argc, char **argv) { argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->set_val("osd_journal_size", "100"); g_ceph_context->_conf->apply_changes(NULL); diff --git a/src/test/fio/fio_ceph_objectstore.cc b/src/test/fio/fio_ceph_objectstore.cc index 784b94f93ca2..bc159c64dd01 100644 --- a/src/test/fio/fio_ceph_objectstore.cc +++ b/src/test/fio/fio_ceph_objectstore.cc @@ -316,7 +316,8 @@ Engine::Engine(thread_data* td) // claim the g_ceph_context reference and release it on destruction cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_OSD, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); // create the ObjectStore diff --git a/src/test/journal/test_main.cc b/src/test/journal/test_main.cc index 66163e5f921b..7808aa68322d 100644 --- a/src/test/journal/test_main.cc +++ b/src/test/journal/test_main.cc @@ -16,8 +16,9 @@ int main(int argc, char **argv) std::vector args; argv_to_vec(argc, (const char **)argv, args); - auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_OSD, + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_MON_CONFIG); g_conf->set_val("lockdep", "true"); common_init_finish(g_ceph_context); diff --git a/src/test/messenger/simple_client.cc b/src/test/messenger/simple_client.cc index 11687041c2af..276371a2ab59 100644 --- a/src/test/messenger/simple_client.cc +++ b/src/test/messenger/simple_client.cc @@ -70,7 +70,7 @@ int main(int argc, const char **argv) auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_ANY, CODE_ENVIRONMENT_UTILITY, - 0); + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); for (arg_iter = args.begin(); arg_iter != args.end();) { if (ceph_argparse_witharg(args, arg_iter, &val, "--addr", diff --git a/src/test/messenger/simple_server.cc b/src/test/messenger/simple_server.cc index dde746cb2e0d..ba54879ea88e 100644 --- a/src/test/messenger/simple_server.cc +++ b/src/test/messenger/simple_server.cc @@ -53,7 +53,7 @@ int main(int argc, const char **argv) auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_ANY, CODE_ENVIRONMENT_DAEMON, - 0); + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); for (arg_iter = args.begin(); arg_iter != args.end();) { if (ceph_argparse_witharg(args, arg_iter, &val, "--addr", diff --git a/src/test/messenger/xio_client.cc b/src/test/messenger/xio_client.cc index 655e2260fd68..c916d4915fb8 100644 --- a/src/test/messenger/xio_client.cc +++ b/src/test/messenger/xio_client.cc @@ -76,7 +76,8 @@ int main(int argc, const char **argv) auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_ANY, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); for (arg_iter = args.begin(); arg_iter != args.end();) { if (ceph_argparse_witharg(args, arg_iter, &val, "--addr", diff --git a/src/test/messenger/xio_server.cc b/src/test/messenger/xio_server.cc index 7b9e46bbc030..0e274ebc061c 100644 --- a/src/test/messenger/xio_server.cc +++ b/src/test/messenger/xio_server.cc @@ -55,7 +55,7 @@ int main(int argc, const char **argv) argv_to_vec(argc, argv, args); global_init(NULL, args, CEPH_ENTITY_TYPE_ANY, CODE_ENVIRONMENT_DAEMON, - 0); + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); for (arg_iter = args.begin(); arg_iter != args.end();) { if (ceph_argparse_witharg(args, arg_iter, &val, "--addr", diff --git a/src/test/mon/test-mon-msg.cc b/src/test/mon/test-mon-msg.cc index 83c049b70e17..7e9832057d06 100644 --- a/src/test/mon/test-mon-msg.cc +++ b/src/test/mon/test-mon-msg.cc @@ -330,7 +330,7 @@ int main(int argc, char *argv[]) auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, - 0); + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc index 3f6d05546f60..65f1150db305 100644 --- a/src/test/mon/test_mon_workloadgen.cc +++ b/src/test/mon/test_mon_workloadgen.cc @@ -1001,7 +1001,7 @@ int main(int argc, const char *argv[]) auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_OSD, CODE_ENVIRONMENT_UTILITY, - 0); + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); diff --git a/src/test/msgr/perf_msgr_client.cc b/src/test/msgr/perf_msgr_client.cc index 6d400d6c0aa5..2cccadfbfe45 100644 --- a/src/test/msgr/perf_msgr_client.cc +++ b/src/test/msgr/perf_msgr_client.cc @@ -179,7 +179,8 @@ int main(int argc, char **argv) argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); diff --git a/src/test/msgr/perf_msgr_server.cc b/src/test/msgr/perf_msgr_server.cc index 79e36721aa84..ff1e5e5f0c94 100644 --- a/src/test/msgr/perf_msgr_server.cc +++ b/src/test/msgr/perf_msgr_server.cc @@ -145,7 +145,8 @@ int main(int argc, char **argv) argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc index 5649b24140ab..ed83a9379259 100644 --- a/src/test/msgr/test_msgr.cc +++ b/src/test/msgr/test_msgr.cc @@ -1520,7 +1520,9 @@ int main(int argc, char **argv) { vector args; argv_to_vec(argc, (const char **)argv, args); - auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); + auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); g_ceph_context->_conf->set_val("auth_cluster_required", "none"); g_ceph_context->_conf->set_val("auth_service_required", "none"); g_ceph_context->_conf->set_val("auth_client_required", "none"); diff --git a/src/test/objectstore/ObjectStoreTransactionBenchmark.cc b/src/test/objectstore/ObjectStoreTransactionBenchmark.cc index 279b10b99691..77c1049443af 100644 --- a/src/test/objectstore/ObjectStoreTransactionBenchmark.cc +++ b/src/test/objectstore/ObjectStoreTransactionBenchmark.cc @@ -247,7 +247,8 @@ int main(int argc, char **argv) argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); Cycles::init(); diff --git a/src/test/objectstore/chain_xattr.cc b/src/test/objectstore/chain_xattr.cc index c0cb31c5e979..3f0d599b24f4 100644 --- a/src/test/objectstore/chain_xattr.cc +++ b/src/test/objectstore/chain_xattr.cc @@ -437,7 +437,8 @@ int main(int argc, char **argv) { argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->set_val("err_to_stderr", "false"); g_ceph_context->_conf->set_val("log_to_stderr", "false"); diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index fa7909db408c..432c3c8c5125 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -7073,7 +7073,8 @@ int main(int argc, char **argv) { argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->set_val("osd_journal_size", "400"); diff --git a/src/test/objectstore/test_bluefs.cc b/src/test/objectstore/test_bluefs.cc index 845ef3531184..1810bb7cc6d3 100644 --- a/src/test/objectstore/test_bluefs.cc +++ b/src/test/objectstore/test_bluefs.cc @@ -578,7 +578,7 @@ int main(int argc, char **argv) { auto cct = global_init(&defaults, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, - 0); + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->set_val( "enable_experimental_unrecoverable_data_corrupting_features", diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc index 4ee1a0411078..09fd4d3a6c69 100644 --- a/src/test/objectstore/test_bluestore_types.cc +++ b/src/test/objectstore/test_bluestore_types.cc @@ -1535,7 +1535,8 @@ int main(int argc, char **argv) { vector args; argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/src/test/objectstore/test_idempotent.cc b/src/test/objectstore/test_idempotent.cc index 3fa04e9004f1..78cdb9879e30 100644 --- a/src/test/objectstore/test_idempotent.cc +++ b/src/test/objectstore/test_idempotent.cc @@ -46,7 +46,8 @@ int main(int argc, char **argv) { argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); diff --git a/src/test/objectstore/test_kv.cc b/src/test/objectstore/test_kv.cc index 6f4db45074b1..cf5948f8c13b 100644 --- a/src/test/objectstore/test_kv.cc +++ b/src/test/objectstore/test_kv.cc @@ -489,7 +489,8 @@ int main(int argc, char **argv) { argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->set_val( "enable_experimental_unrecoverable_data_corrupting_features", diff --git a/src/test/objectstore/test_memstore_clone.cc b/src/test/objectstore/test_memstore_clone.cc index 15ca2d8b8594..c526a293a2c3 100644 --- a/src/test/objectstore/test_memstore_clone.cc +++ b/src/test/objectstore/test_memstore_clone.cc @@ -193,7 +193,8 @@ int main(int argc, char** argv) argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(&defaults, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/objectstore_bench.cc b/src/test/objectstore_bench.cc index 7c67e707ed91..406dce3a75e1 100644 --- a/src/test/objectstore_bench.cc +++ b/src/test/objectstore_bench.cc @@ -154,7 +154,8 @@ int main(int argc, const char *argv[]) argv_to_vec(argc, argv, args); auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_OSD, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); std::string val; vector::iterator i = args.begin(); diff --git a/src/test/os/TestLFNIndex.cc b/src/test/os/TestLFNIndex.cc index cdf5c0104c30..1b51857d91ef 100644 --- a/src/test/os/TestLFNIndex.cc +++ b/src/test/os/TestLFNIndex.cc @@ -470,7 +470,8 @@ int main(int argc, char **argv) { argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/osdc/object_cacher_stress.cc b/src/test/osdc/object_cacher_stress.cc index 961b58162ae7..68f16cd82772 100644 --- a/src/test/osdc/object_cacher_stress.cc +++ b/src/test/osdc/object_cacher_stress.cc @@ -356,7 +356,8 @@ int main(int argc, const char **argv) std::vector args; argv_to_vec(argc, argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); long long delay_ns = 0; long long num_ops = 1000; diff --git a/src/test/perf_local.cc b/src/test/perf_local.cc index 6cafff111ceb..037b31398ffd 100644 --- a/src/test/perf_local.cc +++ b/src/test/perf_local.cc @@ -1021,7 +1021,8 @@ int main(int argc, char *argv[]) argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); Cycles::init(); diff --git a/src/test/rbd_mirror/random_write.cc b/src/test/rbd_mirror/random_write.cc index 77f03edb1b7b..4b41ef044f17 100644 --- a/src/test/rbd_mirror/random_write.cc +++ b/src/test/rbd_mirror/random_write.cc @@ -156,7 +156,8 @@ int main(int argc, const char **argv) argv_to_vec(argc, argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); for (auto i = args.begin(); i != args.end(); ++i) { if (ceph_argparse_flag(args, i, "-h", "--help", (char*)NULL)) { diff --git a/src/test/rgw/test_http_manager.cc b/src/test/rgw/test_http_manager.cc index 7c3da281ab38..bfbcad729991 100644 --- a/src/test/rgw/test_http_manager.cc +++ b/src/test/rgw/test_http_manager.cc @@ -49,7 +49,8 @@ int main(int argc, char** argv) argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); curl_global_init(CURL_GLOBAL_ALL); diff --git a/src/test/rgw/test_rgw_crypto.cc b/src/test/rgw/test_rgw_crypto.cc index 7739b4e99616..0b928a1a802e 100644 --- a/src/test/rgw/test_rgw_crypto.cc +++ b/src/test/rgw/test_rgw_crypto.cc @@ -651,7 +651,9 @@ int main(int argc, char **argv) { vector args; argv_to_vec(argc, (const char **)argv, args); - auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); + auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/rgw/test_rgw_manifest.cc b/src/test/rgw/test_rgw_manifest.cc index 56859d9f952b..aeb9a879cb3e 100644 --- a/src/test/rgw/test_rgw_manifest.cc +++ b/src/test/rgw/test_rgw_manifest.cc @@ -395,7 +395,9 @@ int main(int argc, char **argv) { vector args; argv_to_vec(argc, (const char **)argv, args); - auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); + auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/src/test/rgw/test_rgw_period_history.cc b/src/test/rgw/test_rgw_period_history.cc index efedd269c489..8c4eba70026d 100644 --- a/src/test/rgw/test_rgw_period_history.cc +++ b/src/test/rgw/test_rgw_period_history.cc @@ -323,7 +323,8 @@ int main(int argc, char** argv) argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/test_cors.cc b/src/test/test_cors.cc index b03a2361d989..b362d241ec7c 100644 --- a/src/test/test_cors.cc +++ b/src/test/test_cors.cc @@ -884,7 +884,8 @@ int main(int argc, char *argv[]){ argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_test = new test_cors_helper(); finisher = new Finisher(g_ceph_context); diff --git a/src/test/test_features.cc b/src/test/test_features.cc index eca067cb7531..7466d838bfcc 100644 --- a/src/test/test_features.cc +++ b/src/test/test_features.cc @@ -36,7 +36,8 @@ int main(int argc, char **argv) argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/test_filejournal.cc b/src/test/test_filejournal.cc index 29aab9bf9708..c48f9bec619e 100644 --- a/src/test/test_filejournal.cc +++ b/src/test/test_filejournal.cc @@ -71,7 +71,8 @@ int main(int argc, char **argv) { argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); char mb[10]; diff --git a/src/test/test_mempool.cc b/src/test/test_mempool.cc index ceda676c41c7..44fcbcbeaca2 100644 --- a/src/test/test_mempool.cc +++ b/src/test/test_mempool.cc @@ -371,7 +371,8 @@ int main(int argc, char **argv) argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); // enable debug mode for the tests diff --git a/src/test/test_mutate.cc b/src/test/test_mutate.cc index fd582176e531..b453895ccc13 100644 --- a/src/test/test_mutate.cc +++ b/src/test/test_mutate.cc @@ -44,7 +44,8 @@ int main(int argc, const char **argv) vector args; argv_to_vec(argc, argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); string val; diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc index a7be06cfefbd..de08859b7681 100644 --- a/src/test/test_rgw_admin_log.cc +++ b/src/test/test_rgw_admin_log.cc @@ -1573,7 +1573,8 @@ int main(int argc, char *argv[]){ argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_test = new admin_log::test_helper(); finisher = new Finisher(g_ceph_context); diff --git a/src/test/test_rgw_admin_meta.cc b/src/test/test_rgw_admin_meta.cc index 0d61c18e7056..62b8fe8298f6 100644 --- a/src/test/test_rgw_admin_meta.cc +++ b/src/test/test_rgw_admin_meta.cc @@ -909,7 +909,8 @@ int main(int argc, char *argv[]){ argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_test = new admin_meta::test_helper(); finisher = new Finisher(g_ceph_context); diff --git a/src/test/test_rgw_admin_opstate.cc b/src/test/test_rgw_admin_opstate.cc index 1a41df30f1aa..29ca6a7db272 100644 --- a/src/test/test_rgw_admin_opstate.cc +++ b/src/test/test_rgw_admin_opstate.cc @@ -806,7 +806,8 @@ int main(int argc, char *argv[]){ argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); store = RGWStoreManager::get_storage(g_ceph_context, false, false, false, false, false); g_test = new admin_log::test_helper(); diff --git a/src/test/test_trans.cc b/src/test/test_trans.cc index 332b974460aa..ce9a5e54d96d 100644 --- a/src/test/test_trans.cc +++ b/src/test/test_trans.cc @@ -39,7 +39,8 @@ int main(int argc, const char **argv) argv_to_vec(argc, argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); // args diff --git a/src/test/testkeys.cc b/src/test/testkeys.cc index f340496ebebc..16e52d6db1c4 100644 --- a/src/test/testkeys.cc +++ b/src/test/testkeys.cc @@ -14,7 +14,8 @@ int main(int argc, const char **argv) argv_to_vec(argc, argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); KeyRing extra; KeyServer server(g_ceph_context, &extra); diff --git a/src/test/testmsgr.cc b/src/test/testmsgr.cc index 3691443eb41e..4765757c8e71 100644 --- a/src/test/testmsgr.cc +++ b/src/test/testmsgr.cc @@ -73,7 +73,8 @@ int main(int argc, const char **argv, const char *envp[]) { argv_to_vec(argc, argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); dout(0) << "i am mon " << args[0] << dendl; diff --git a/src/test/unit.cc b/src/test/unit.cc index 53c58ea15c8c..d845f8bee4d4 100644 --- a/src/test/unit.cc +++ b/src/test/unit.cc @@ -37,7 +37,8 @@ int main(int argc, char **argv) { std::vector args(argv, argv + argc); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_MON_CONFIG); common_init_finish(g_ceph_context); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/xattr_bench.cc b/src/test/xattr_bench.cc index ff3e6ada66eb..23b7fd44307c 100644 --- a/src/test/xattr_bench.cc +++ b/src/test/xattr_bench.cc @@ -153,7 +153,8 @@ int main(int argc, char **argv) { argv_to_vec(argc, (const char **)argv, args); auto cct = global_init(0, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); std::cerr << "args: " << args << std::endl; diff --git a/src/tools/ceph-client-debug.cc b/src/tools/ceph-client-debug.cc index 51790f928e56..116a19543ed8 100644 --- a/src/tools/ceph-client-debug.cc +++ b/src/tools/ceph-client-debug.cc @@ -87,7 +87,8 @@ int main(int argc, const char **argv) auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, - CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS); + CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS| + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); diff --git a/src/tools/ceph_monstore_tool.cc b/src/tools/ceph_monstore_tool.cc index 11abe8da21c2..ec573fab26a8 100644 --- a/src/tools/ceph_monstore_tool.cc +++ b/src/tools/ceph_monstore_tool.cc @@ -837,7 +837,8 @@ int main(int argc, char **argv) { auto cct = global_init( NULL, ceph_options, CEPH_ENTITY_TYPE_MON, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_MON_CONFIG); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); g_conf = g_ceph_context->_conf;