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 <sage@redhat.com>

diff --git a/src/log/test.cc b/src/log/test.cc
index b25ec41e3b7bda8204334d5b3e2877fbbaf0df6b..fae67e964fc8efeacdee553e58af862aac8f0646 100644 (file)
--- 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 e35f085fcafd7e4109f48ff000abe1a33154111d..d041230cb25f2f5109e2431a93a640887e18b7d5 100644 (file)
--- 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<const char*> 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 8d3f6882c93cff222816e5da37977cff43715fe3..d194db1865c3df142461977d130306e4a137d847 100644 (file)
--- 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 1f5ff46e257e326b4cbefeb1a4a36459270eaf56..1f24c8f964051585a0ad1d55d17697cf90422174 100644 (file)
--- 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 edf4efc9c549b20fac51055cf5f6ea2e101bb78d..cf6ef4b5e79e8c7904f5ba2dfe5d8b0a67cfba18 100644 (file)
--- 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 36761841cad4ca0fdb111b515138d2db39bf31e4..2acbf1de48d83f1de56493be9fab46416aef7dcf 100644 (file)
--- 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 93a8e842d3bf42c079369a371edcb23672a76e1c..2ba014d46b28a9b837cc071cc5e7e85c78c783a4 100644 (file)
--- 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 aebfba4305fa35aad4a7ddf0e78d5fa923a8fa06..ec240823b956e0c6e19bd53fcee517db0caa2d48 100644 (file)
--- 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 fab0f62d515de1929dc6aa18c9a97d60ffe4fec6..2789e42277806fef79e015ba52fe27cb16fecdab 100644 (file)
--- 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 b6950cbcceb2561309d138b42f568fd9f7c3df54..c52571302135dfbf12c9205fdd861ded216d47cf 100644 (file)
--- 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 dffe0aad336829a7946ddc4cd14dd3625c02f184..f01db75ed23a8ad77bcc467be853b19be686bac0 100644 (file)
--- 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 0c5767173660df45e63b6f6f211e2f848a0ab9c8..738f05a4782edf0078299b420447981d17319949 100644 (file)
--- 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 8e497196d03ed1f1f083f0d9d51ce5fe69751802..3fd7beccd9d26866108f6e4aeb549c2dc5a0b291 100644 (file)
--- 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 8cc6665394eb55f5664f6ca3ffd8177d1af9cd7f..bf1026d74550d0ab4e821638ec3a350280ea7138 100644 (file)
--- 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 784b94f93ca2ed7ff883a9fea9a37708a6e39c10..bc159c64dd0143918a1fb738331976f21bdd7973 100644 (file)
--- 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 66163e5f921ba704021c4e9fa3cbc2d2cfa7dd8d..7808aa68322dba79597fa8f0de37d78719f7545b 100644 (file)
--- 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<const char*> 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 11687041c2af7e859892ec8676183b8b25720e68..276371a2ab59875956a78d0aa9188a4688786399 100644 (file)
--- 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 dde746cb2e0db94b830218ecaaa45681daf0361b..ba54879ea88e58fa8bb84f68ad9bd43c537a860d 100644 (file)
--- 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 655e2260fd688f7b4b65b1885d03325c9385c836..c916d4915fb84dbb387b9b2060d893b5e4598fb9 100644 (file)
--- 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 7b9e46bbc0302529d7e1f7cd468cf2b99517efed..0e274ebc061cdf9d3f5c659875d8d41928608892 100644 (file)
--- 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 83c049b70e17c3d82da4697c3d7617b3b7e21c98..7e9832057d06756e47c29962acb49bd1944ae134 100644 (file)
--- 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 3f6d05546f606c936188477db4b84820d14fa901..65f1150db3053f2885070841b94bbc8e67fb632e 100644 (file)
--- 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 6d400d6c0aa5c7458a3407907441e6f2663a3e58..2cccadfbfe4537616b9a9ea5e4bb81ba6e15fb3c 100644 (file)
--- 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 79e36721aa843f3e9659b13555a6c6cf789ac00c..ff1e5e5f0c94931ad8b5e19d40f472ddb15dd203 100644 (file)
--- 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 5649b24140ab36f604042b6ef6ac5de460cf0502..ed83a93792595b135bfed0939ef9b8458956f932 100644 (file)
--- 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<const char*> 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 279b10b99691e0de935822f2429c20030c056d93..77c1049443af8cf99d9b32e4f7114e3447a9fce3 100644 (file)
--- 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 c0cb31c5e979ceb99cca702ca83e4bdc46bb34e5..3f0d599b24f42014ec2f453b52b6c561fd85245d 100644 (file)
--- 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 fa7909db408c9d113f45aa9c71b1d31c90718381..432c3c8c5125ea5a21fcc615a260135b5914a97f 100644 (file)
--- 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 845ef353118459dd97471f0133763e3da73fb2d2..1810bb7cc6d383da619e93062134dfee10441870 100644 (file)
--- 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 4ee1a0411078a3dc57eb598fb5388fd7b498cb75..09fd4d3a6c691022ee0c9a3596043f54919d1049 100644 (file)
--- 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<const char*> 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 3fa04e9004f124380d56d65623682dbaba4a7c39..78cdb9879e302b83ce2da4d133276be30eaa91b5 100644 (file)
--- 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 6f4db45074b1c80c82c02b612d7569712a5b6e20..cf5948f8c13b2dea6a05b4056c24e321c6e03923 100644 (file)
--- 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 15ca2d8b859439fba8bad150c86f5610a80e3b7f..c526a293a2c3ff270ed532cbe53c2d3ad0b3cbec 100644 (file)
--- 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 7c67e707ed911ff2fa61daf579c87e1b3257b932..406dce3a75e1559e3c4ac1da5e593793a6359c08 100644 (file)
--- 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<const char*>::iterator i = args.begin();

diff --git a/src/test/os/TestLFNIndex.cc b/src/test/os/TestLFNIndex.cc
index cdf5c0104c30077b70f880e30e6bc63c4ff1fc36..1b51857d91efdf03c94f6c3d10cdd0c8aef60311 100644 (file)
--- 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 961b58162ae7ebddb4069eb06d4dc70624d8b83b..68f16cd82772631a8ee2a751928c6ba677b23036 100644 (file)
--- 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<const char*> 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 6cafff111ceb1d754d388ad50788789f1b794740..037b31398ffd6e5f0fb9821f6732892f2744b8d9 100644 (file)
--- 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 77f03edb1b7b4b1d44d3ed1eaa4159ec1a5cde91..4b41ef044f1710e2b32a1734d1698501f4e93091 100644 (file)
--- 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 7c3da281ab38a338e49484239d226a8c3c65ef35..bfbcad7299911a38b5a62ab1881290988b871995 100644 (file)
--- 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 7739b4e996164737921070abd0a365b2e88ff2c6..0b928a1a802e5ebaeb97bd7712da719399e96a5c 100644 (file)
--- 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<const char*> 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 56859d9f952bdebbe691b795e20952f1fe21fb23..aeb9a879cb3e1f5968e5a438dad49062531278a3 100644 (file)
--- 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<const char*> 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 efedd269c4892cd883ed3c6d749df9ee042e776a..8c4eba70026dd21db6e2847dd68e7bd741e12492 100644 (file)
--- 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 b03a2361d98961ec9852a692c9a607498d02c7bf..b362d241ec7ccc92d6cdbace2e6d3bbd91c98aa1 100644 (file)
--- 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 eca067cb7531da8540cf8948cac730af50c1d6bb..7466d838bfcc5404be3bb284588ee58b10ace42f 100644 (file)
--- 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 29aab9bf970813e29f89a54c72414d45a4d1eb0e..c48f9bec619eeb76865ba8a1f065997408e510f0 100644 (file)
--- 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 ceda676c41c7c0855262924e8ee52c6c26b07339..44fcbcbeaca2c85d64396810902529ad69a0c6e8 100644 (file)
--- 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 fd582176e5315ae685072d27c154240c9806a343..b453895ccc136f62c3fde5ec8c8a1223b7bf3941 100644 (file)
--- a/src/test/test_mutate.cc
+++ b/src/test/test_mutate.cc
@@ -44,7 +44,8 @@ int main(int argc, const char **argv)
   vector<const char*> 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 a7be06cfefbdf3c259efbcf91d1581893f7fe75d..de08859b7681b9e3dade72f91cbcf5b0c92f7b06 100644 (file)
--- 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 0d61c18e7056084ac05fd19c536aa40fb787214a..62b8fe8298f67031ef6c46114a4f903be50f189d 100644 (file)
--- 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 1a41df30f1aa08a3bb03292cdd6a8a9890016824..29ca6a7db272b2099254023dc2c10ce361baa3a4 100644 (file)
--- 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 332b974460aa47ff407773238f8371da88b3680d..ce9a5e54d96da78ca154ba23592276af7681d0cc 100644 (file)
--- 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 f340496ebebc025b5dd09ac3fe99932ddba56dab..16e52d6db1c42cf68f4582c5b56c4eddf49ea1e4 100644 (file)
--- 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 3691443eb41ea320ca9a853fe5540364e135d4e5..4765757c8e719526b45f848911cf1e272bf04c41 100644 (file)
--- 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 53c58ea15c8c2630b37a1795485f938d383c8241..d845f8bee4d4ed4bea81a553bb7d3680ee898f29 100644 (file)
--- a/src/test/unit.cc
+++ b/src/test/unit.cc
@@ -37,7 +37,8 @@ int main(int argc, char **argv) {
   std::vector<const char*> 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 ff3e6ada66ebe596e73cc655a4d41878151fcb03..23b7fd44307cda96e4363df681a54d01e34d9810 100644 (file)
--- 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 51790f928e568e3a7c2c7bc05073144f35872f6d..116a19543ed836cc551034e57071114f21feb488 100644 (file)
--- 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 11abe8da21c2e051ef7b572656e5fdb296e22fe7..ec573fab26a8e36e0fbb92c85e7784bcec01058c 100644 (file)
--- 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;