drop unnecessary env_to_vec calls

global[_pre]_init does this for us now.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index 2b3dfb86e7bfa96e1c521b7b315bb30a8bceb623..6e2d21792f605f95812150684a9494d15125d018 100644 (file)
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -77,7 +77,6 @@ int main(int argc, const char **argv, const char *envp[]) {
   if (args.empty()) {
     usage();
   }
-  env_to_vec(args);
 
   std::map<std::string,std::string> defaults = {
     { "pid_file", "" },

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index b1a161abb688bd403a309a80b874a53fe7b24d27..e0c00f3bb8e6a5a2491945386abd751a46fc066e 100644 (file)
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -99,7 +99,6 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args,
                         CEPH_ENTITY_TYPE_MDS, CODE_ENVIRONMENT_DAEMON,

diff --git a/src/ceph_mgr.cc b/src/ceph_mgr.cc
index 77e3933666c652c092ded4386a43c705054d1194..0f7b75842975e0e189d4f882d7110252f5776874 100644 (file)
--- a/src/ceph_mgr.cc
+++ b/src/ceph_mgr.cc
@@ -45,7 +45,6 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   map<string,string> defaults = {
     { "keyring", "$mgr_data/keyring" }

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index d0791955f0f4f8c8de56fa5dee7a4af8e95b4167..f3bbc6dc8c2844f647fbebae70885ea9365bbedb 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -197,7 +197,6 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   // We need to specify some default values that may be overridden by the
   // user, that are specific to the monitor.  The options we are overriding

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 28d5788c531123d33232f7cbf0e67575ecdd5e1d..62092a5ac4852778e76ff89b309aa4848c2184e4 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -110,7 +110,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   map<string,string> defaults = {
     // We want to enable leveldb's log, while allowing users to override this

diff --git a/src/librados-config.cc b/src/librados-config.cc
index ba4799a412d73544f7d3869e85fa8c87552ef1cf..a7fb69ba13c45cb9e9002c67fa1628164305951b 100644 (file)
--- a/src/librados-config.cc
+++ b/src/librados-config.cc
@@ -37,7 +37,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   bool opt_version = false;
   bool opt_vernum = false;

diff --git a/src/os/bluestore/bluestore_tool.cc b/src/os/bluestore/bluestore_tool.cc
index f5c02bc1c6e4bb1f749288e73ec0f4057e6450af..f8fbaeb0af799e27f6fd90603fe66b7cf60fd108 100644 (file)
--- a/src/os/bluestore/bluestore_tool.cc
+++ b/src/os/bluestore/bluestore_tool.cc
@@ -292,7 +292,6 @@ int main(int argc, char **argv)
   for (auto& i : ceph_option_strings) {
     args.push_back(i.c_str());
   }
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/rbd_replay/rbd-replay.cc b/src/rbd_replay/rbd-replay.cc
index ed174a43050f6e61671a2333c30f394bae32fd19..72f12c127bb42889420fb606d5444561e0c49a55 100644 (file)
--- a/src/rbd_replay/rbd-replay.cc
+++ b/src/rbd_replay/rbd-replay.cc
@@ -58,7 +58,6 @@ int main(int argc, const char **argv) {
   vector<const char*> args;
 
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);
 

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index 4920d0650c0a1a57a59a3b24e2b1d1a6c52aef2b..65b275963bc93bc791e2caa2a0cd606b7f8977a1 100644 (file)
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -689,7 +689,6 @@ int librgw_create(librgw_t* rgw, int argc, char **argv)
       for (const auto& elt : spl_args) {
        args.push_back(elt.c_str());
       }
-      env_to_vec(args);
       rc = rgwlib.init(args);
     }
   }

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 345ca7b5d32ef4b7fef7b4c8382001d9c5983a93..e8573ae7932772bea9d52ed9b8cc8697f8b9be50 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -2382,7 +2382,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/rgw/rgw_es_main.cc b/src/rgw/rgw_es_main.cc
index 91a57571f22721c0cffb5c7ac63f9b4235a466b9..cd6d54a674c21b248745f803cc19c5da9a98f67d 100644 (file)
--- a/src/rgw/rgw_es_main.cc
+++ b/src/rgw/rgw_es_main.cc
@@ -14,7 +14,6 @@ int main(int argc, char *argv[])
 {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index b8d1aee5d63290d239797359797daa18efc5b378..d1e80b27515f8ad59e898385caf2e622f0e28708 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -190,7 +190,6 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   // First, let's determine which frontends are configured.
   int flags = CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS;

diff --git a/src/rgw/rgw_object_expirer.cc b/src/rgw/rgw_object_expirer.cc
index 760f8fffef28b8a3c27fce89d8d70b79bc2ce6dd..ec7faf29151bd78599059a97997f943275ee8871 100644 (file)
--- a/src/rgw/rgw_object_expirer.cc
+++ b/src/rgw/rgw_object_expirer.cc
@@ -57,7 +57,6 @@ int main(const int argc, const char **argv)
 {
   vector<const char *> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_DAEMON,

diff --git a/src/rgw/rgw_token.cc b/src/rgw/rgw_token.cc
index 04ef1fa7b4713809b28c5eb49d2070b5a177344d..18e30e33526bb4695db004f3b3adc88b0fb8af46 100644 (file)
--- a/src/rgw/rgw_token.cc
+++ b/src/rgw/rgw_token.cc
@@ -62,7 +62,6 @@ int main(int argc, char **argv)
   std::string val;
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/TestSignalHandlers.cc b/src/test/TestSignalHandlers.cc
index 359cde08a8c4a9b39b86e5e353c7cc3612ef00bb..1f5ff46e257e326b4cbefeb1a4a36459270eaf56 100644 (file)
--- a/src/test/TestSignalHandlers.cc
+++ b/src/test/TestSignalHandlers.cc
@@ -78,7 +78,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/TestTimers.cc b/src/test/TestTimers.cc
index 691cab3e718a6abbc2df1458f0783a7e84603690..edf4efc9c549b20fac51055cf5f6ea2e101bb78d 100644 (file)
--- a/src/test/TestTimers.cc
+++ b/src/test/TestTimers.cc
@@ -253,7 +253,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/bench_log.cc b/src/test/bench_log.cc
index 0e5bcfce51e7f672e58a06260693a9f3ff95ba85..36761841cad4ca0fdb111b515138d2db39bf31e4 100644 (file)
--- a/src/test/bench_log.cc
+++ b/src/test/bench_log.cc
@@ -39,7 +39,6 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_OSD,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/ceph_crypto.cc b/src/test/ceph_crypto.cc
index aa76ee8313febe5e4c3192ae3356112948c47901..fc8f4ed8b455ac6de98bc6e94074bc2278cb0aa3 100644 (file)
--- a/src/test/ceph_crypto.cc
+++ b/src/test/ceph_crypto.cc
@@ -147,7 +147,6 @@ TEST_F(ForkDeathTest, MD5) {
 
 int main(int argc, char **argv) {
   std::vector<const char*> args(argv, argv + argc);
-  env_to_vec(args);
   auto cct = global_init(NULL, args,
                          CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/crush/CrushWrapper.cc b/src/test/crush/CrushWrapper.cc
index c5d81bc7e0680b727493fd4e50efefefbb79111d..aebfba4305fa35aad4a7ddf0e78d5fa923a8fa06 100644 (file)
--- a/src/test/crush/CrushWrapper.cc
+++ b/src/test/crush/CrushWrapper.cc
@@ -1421,7 +1421,6 @@ TEST(CrushWrapper, try_remap_rule) {
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   map<string,string> defaults = {
     { "debug_crush", "0" }

diff --git a/src/test/direct_messenger/test_direct_messenger.cc b/src/test/direct_messenger/test_direct_messenger.cc
index 0540baa48cde85b18f25fb67e8388ca746fe258a..fab0f62d515de1929dc6aa18c9a97d60ffe4fec6 100644 (file)
--- a/src/test/direct_messenger/test_direct_messenger.cc
+++ b/src/test/direct_messenger/test_direct_messenger.cc
@@ -426,7 +426,6 @@ int main(int argc, char **argv)
   // command-line arguments
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_ANY,
                          CODE_ENVIRONMENT_DAEMON, 0);

diff --git a/src/test/messenger/simple_client.cc b/src/test/messenger/simple_client.cc
index e85c73e4230e135afc58060875af6460a1160e98..11687041c2af7e859892ec8676183b8b25720e68 100644 (file)
--- a/src/test/messenger/simple_client.cc
+++ b/src/test/messenger/simple_client.cc
@@ -67,7 +67,6 @@ int main(int argc, const char **argv)
        ts.tv_nsec = 0;
 
        argv_to_vec(argc, argv, args);
-       env_to_vec(args);
 
        auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_ANY,
                               CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/messenger/simple_server.cc b/src/test/messenger/simple_server.cc
index 34277d513ff92129483c07610b14f1fd70834cb1..dde746cb2e0db94b830218ecaaa45681daf0361b 100644 (file)
--- a/src/test/messenger/simple_server.cc
+++ b/src/test/messenger/simple_server.cc
@@ -50,7 +50,6 @@ int main(int argc, const char **argv)
        cout << "Simple Server starting..." << endl;
 
        argv_to_vec(argc, argv, args);
-       env_to_vec(args);
 
        auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_ANY,
                               CODE_ENVIRONMENT_DAEMON,

diff --git a/src/test/messenger/xio_client.cc b/src/test/messenger/xio_client.cc
index 35218cbb25890ca42ed518f0412e3b93122c2144..655e2260fd688f7b4b65b1885d03325c9385c836 100644 (file)
--- a/src/test/messenger/xio_client.cc
+++ b/src/test/messenger/xio_client.cc
@@ -73,7 +73,6 @@ int main(int argc, const char **argv)
        ts.tv_nsec = 0;
 
        argv_to_vec(argc, argv, args);
-       env_to_vec(args);
 
        auto cct = global_init(NULL, args,
                               CEPH_ENTITY_TYPE_ANY,

diff --git a/src/test/messenger/xio_server.cc b/src/test/messenger/xio_server.cc
index d50737b924b7c6e64048fb119694c96f23a0c5c1..7b9e46bbc0302529d7e1f7cd468cf2b99517efed 100644 (file)
--- a/src/test/messenger/xio_server.cc
+++ b/src/test/messenger/xio_server.cc
@@ -53,7 +53,6 @@ int main(int argc, const char **argv)
        cout << "Xio Server starting..." << endl;
 
        argv_to_vec(argc, argv, args);
-       env_to_vec(args);
 
        global_init(NULL, args, CEPH_ENTITY_TYPE_ANY, CODE_ENVIRONMENT_DAEMON,
                    0);

diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc
index d3cac601faadb295c65dcc69be90f8ee138e3a39..5649b24140ab36f604042b6ef6ac5de460cf0502 100644 (file)
--- a/src/test/msgr/test_msgr.cc
+++ b/src/test/msgr/test_msgr.cc
@@ -1519,7 +1519,6 @@ TEST(DummyTest, ValueParameterizedTestsAreNotSupportedOnThisPlatform) {}
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
   g_ceph_context->_conf->set_val("auth_cluster_required", "none");

diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index 535df9b21e02f689faabd0910786c0b7d7b5e052..fa7909db408c9d113f45aa9c71b1d31c90718381 100644 (file)
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -7071,7 +7071,6 @@ TEST_P(StoreTest, BluestoreRepairTest) {
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/objectstore/test_bluefs.cc b/src/test/objectstore/test_bluefs.cc
index da5fbad683fdc8ffff441f93f76d704dc47ec6fa..845ef353118459dd97471f0133763e3da73fb2d2 100644 (file)
--- a/src/test/objectstore/test_bluefs.cc
+++ b/src/test/objectstore/test_bluefs.cc
@@ -570,7 +570,6 @@ TEST(BlueFS, test_replay) {
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   map<string,string> defaults = {
     { "debug_bluefs", "1/20" },

diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc
index ab497550da0b85781279963754f85a165e1fd078..4ee1a0411078a3dc57eb598fb5388fd7b498cb75 100644 (file)
--- a/src/test/objectstore/test_bluestore_types.cc
+++ b/src/test/objectstore/test_bluestore_types.cc
@@ -1534,7 +1534,6 @@ TEST(BlueStoreRepairer, StoreSpaceTracker)
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);
   common_init_finish(g_ceph_context);

diff --git a/src/test/objectstore/test_kv.cc b/src/test/objectstore/test_kv.cc
index 1d47b2737533fed5b99ec44d9d2fcddf7bd1b6c4..6f4db45074b1c80c82c02b612d7569712a5b6e20 100644 (file)
--- a/src/test/objectstore/test_kv.cc
+++ b/src/test/objectstore/test_kv.cc
@@ -487,7 +487,6 @@ TEST(DummyTest, ValueParameterizedTestsAreNotSupportedOnThisPlatform) {}
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/objectstore_bench.cc b/src/test/objectstore_bench.cc
index a23b0c4cba8b3ddede39716073031f95a83f97ef..7c67e707ed911ff2fa61daf579c87e1b3257b932 100644 (file)
--- a/src/test/objectstore_bench.cc
+++ b/src/test/objectstore_bench.cc
@@ -152,7 +152,6 @@ int main(int argc, const char *argv[])
   // command-line arguments
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_OSD,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc
index e1a46f31f6dbbac135e172c5795ddc2a9c843e23..b3a982461d55e6e20a55cd93121a0d355a7703ba 100644 (file)
--- a/src/test/osd/TestOSDMap.cc
+++ b/src/test/osd/TestOSDMap.cc
@@ -14,7 +14,6 @@ using namespace std;
 
 int main(int argc, char **argv) {
   std::vector<const char*> args(argv, argv+argc);
-  env_to_vec(args);
   auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/osdc/object_cacher_stress.cc b/src/test/osdc/object_cacher_stress.cc
index bca96512fedbeb6d02984f6762e8ae99baf60fab..961b58162ae7ebddb4069eb06d4dc70624d8b83b 100644 (file)
--- a/src/test/osdc/object_cacher_stress.cc
+++ b/src/test/osdc/object_cacher_stress.cc
@@ -355,7 +355,6 @@ int main(int argc, const char **argv)
 {
   std::vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);
 

diff --git a/src/test/rbd_mirror/random_write.cc b/src/test/rbd_mirror/random_write.cc
index c25f473c6fd9e2426c8067c3c30fc62d97a974d5..77f03edb1b7b4b1d44d3ed1eaa4159ec1a5cde91 100644 (file)
--- a/src/test/rbd_mirror/random_write.cc
+++ b/src/test/rbd_mirror/random_write.cc
@@ -154,7 +154,6 @@ int main(int argc, const char **argv)
 {
   std::vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/rgw/test_rgw_manifest.cc b/src/test/rgw/test_rgw_manifest.cc
index e72ecc50c770583388b11dd731e59426720bd1f8..56859d9f952bdebbe691b795e20952f1fe21fb23 100644 (file)
--- a/src/test/rgw/test_rgw_manifest.cc
+++ b/src/test/rgw/test_rgw_manifest.cc
@@ -394,7 +394,6 @@ TEST(TestRGWManifest, old_obj_manifest) {
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
   common_init_finish(g_ceph_context);

diff --git a/src/test/test_mutate.cc b/src/test/test_mutate.cc
index 023b4f2d5156be44b6856bddb29b568c06479410..fd582176e5315ae685072d27c154240c9806a343 100644 (file)
--- a/src/test/test_mutate.cc
+++ b/src/test/test_mutate.cc
@@ -43,7 +43,6 @@ int main(int argc, const char **argv)
   int ret = 0;
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);
   common_init_finish(g_ceph_context);

diff --git a/src/test/test_trans.cc b/src/test/test_trans.cc
index 75782c80d56dc3b65b1bf0e01165cd3c21271f7c..332b974460aa47ff407773238f8371da88b3680d 100644 (file)
--- a/src/test/test_trans.cc
+++ b/src/test/test_trans.cc
@@ -37,7 +37,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/testkeys.cc b/src/test/testkeys.cc
index 45b897b68fe8d1a1ba7be563bcc129b789424b64..f340496ebebc025b5dd09ac3fe99932ddba56dab 100644 (file)
--- a/src/test/testkeys.cc
+++ b/src/test/testkeys.cc
@@ -12,7 +12,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/testmsgr.cc b/src/test/testmsgr.cc
index 369587a9b2a1df7da4af06f50f269b5a5d2b5181..3691443eb41ea320ca9a853fe5540364e135d4e5 100644 (file)
--- a/src/test/testmsgr.cc
+++ b/src/test/testmsgr.cc
@@ -71,7 +71,6 @@ int main(int argc, const char **argv, const char *envp[]) {
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/unit.cc b/src/test/unit.cc
index 33a60205df4608410994f058d6db3d58f3b55068..bc7e7260f6b9a17f50a0b6cbf35732ede82c9ff9 100644 (file)
--- a/src/test/unit.cc
+++ b/src/test/unit.cc
@@ -35,7 +35,6 @@
  */
 int main(int argc, char **argv) {
   std::vector<const char*> args(argv, argv + argc);
-  env_to_vec(args);
   auto cct = global_init(NULL, args,
                         CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/tools/ceph-client-debug.cc b/src/tools/ceph-client-debug.cc
index 7af2ec6f87ca50957ef806c87e4ba838fb28517a..51790f928e568e3a7c2c7bc05073144f35872f6d 100644 (file)
--- a/src/tools/ceph-client-debug.cc
+++ b/src/tools/ceph-client-debug.cc
@@ -84,7 +84,6 @@ int main(int argc, const char **argv)
   // Argument handling
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/tools/ceph_authtool.cc b/src/tools/ceph_authtool.cc
index 294594d4c6b88ea32a233333b69244ab9d30afaf..23370f7307e4ccbb656844bf785d6fe6735d1bd7 100644 (file)
--- a/src/tools/ceph_authtool.cc
+++ b/src/tools/ceph_authtool.cc
@@ -54,7 +54,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   std::string add_key;
   std::string caps_fn;

diff --git a/src/tools/ceph_conf.cc b/src/tools/ceph_conf.cc
index 12399c0099b9d7225f3f1b12a239c188002eefce..9f806b55517bf24d3bf8b92b01deef7310cc7353 100644 (file)
--- a/src/tools/ceph_conf.cc
+++ b/src/tools/ceph_conf.cc
@@ -174,7 +174,6 @@ int main(int argc, const char **argv)
   std::string dump_format;
 
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
   vector<const char*> orig_args = args;
 
   global_pre_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON,

diff --git a/src/tools/ceph_kvstore_tool.cc b/src/tools/ceph_kvstore_tool.cc
index dc1188253dfbd67a0fa47692c69dd0d0a6c6eeea..2103efc87acad991ef03c3424a4f241d7e98b8bd 100644 (file)
--- a/src/tools/ceph_kvstore_tool.cc
+++ b/src/tools/ceph_kvstore_tool.cc
@@ -317,7 +317,6 @@ int main(int argc, const char *argv[])
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(
       NULL, args,

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 93115fcc9a10bf73a9019285ae79a1903916c3d3..5e7109761ddfc719f5e5735dfb08546f8996083e 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -3033,7 +3033,6 @@ int main(int argc, char **argv)
   head = (vm.count("head") > 0);
 
   vector<const char *> ceph_options;
-  env_to_vec(ceph_options);
   ceph_options.reserve(ceph_options.size() + ceph_option_strings.size());
   for (vector<string>::iterator i = ceph_option_strings.begin();
        i != ceph_option_strings.end();

diff --git a/src/tools/cephfs/cephfs-data-scan.cc b/src/tools/cephfs/cephfs-data-scan.cc
index e7034539bd77f3fe7edfc4f4ca562e48d6a7ad64..3e6d81217fd1019812fc37fd0165f38383cea318 100644 (file)
--- a/src/tools/cephfs/cephfs-data-scan.cc
+++ b/src/tools/cephfs/cephfs-data-scan.cc
@@ -12,7 +12,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/tools/cephfs/cephfs-journal-tool.cc b/src/tools/cephfs/cephfs-journal-tool.cc
index e4c1287d45575e808fa2d55918647402215ff344..f9537b2d449a92bdbfdb647fb06e58979891522c 100644 (file)
--- a/src/tools/cephfs/cephfs-journal-tool.cc
+++ b/src/tools/cephfs/cephfs-journal-tool.cc
@@ -25,7 +25,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                             CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/tools/cephfs/cephfs-table-tool.cc b/src/tools/cephfs/cephfs-table-tool.cc
index 124ff23468c52b4bd96b90a12e1426cbefee9bcd..7c8e23f324019e0ee08e9831cb1e419fc427683f 100644 (file)
--- a/src/tools/cephfs/cephfs-table-tool.cc
+++ b/src/tools/cephfs/cephfs-table-tool.cc
@@ -12,7 +12,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index 65916a92adb6e5cb567fa6ba0a8e0c6d822fa0a8..e640f2ada9204e0ffd4c773fe69918497b38f9d4 100644 (file)
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -406,9 +406,8 @@ int main(int argc, const char **argv)
 
   // we use -c, don't confuse the generic arg parsing
   // only parse arguments from CEPH_ARGS, if in the environment
-  vector<const char *> env_args;
-  env_to_vec(env_args);
-  auto cct = global_init(NULL, env_args, CEPH_ENTITY_TYPE_CLIENT,
+  vector<const char *> empty_args;
+  auto cct = global_init(NULL, empty_args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,
                         CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   // crushtool times out occasionally when quits. so do not

diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc
index 2b44bbb18d7aeb4db7a1142f56399e61f6075f45..2eb0b96f3c92cf523dfd73c2cd492a202bbc3cf4 100644 (file)
--- a/src/tools/osdmaptool.cc
+++ b/src/tools/osdmaptool.cc
@@ -88,7 +88,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_UTILITY,

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index c5761eaa1dce8ef24dba42af4731a05cb5db1bc8..a9235bc26399f8c60134dcd730f3eab945b4f84f 100644 (file)
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -3705,7 +3705,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   std::map < std::string, std::string > opts;
   std::string val;

diff --git a/src/tools/rbd/Shell.cc b/src/tools/rbd/Shell.cc
index 56a14752984db3166505b8f120357b1bd4ad7ceb..cbe21b117370bcc781ebf5fdba222aa5bd42bba9 100644 (file)
--- a/src/tools/rbd/Shell.cc
+++ b/src/tools/rbd/Shell.cc
@@ -31,7 +31,6 @@ boost::intrusive_ptr<CephContext> global_init(
   std::vector<const char*> cmd_args;
   argv_to_vec(argc, argv, cmd_args);
   std::vector<const char*> args(cmd_args);
-  env_to_vec(args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);
 

diff --git a/src/tools/rbd_ggate/main.cc b/src/tools/rbd_ggate/main.cc
index 6acdfec51e76721555a8bb699d33c1e89890ddd2..e476ebb4c7a4a6f3bc0e36397460ac1c28b31d3b 100644 (file)
--- a/src/tools/rbd_ggate/main.cc
+++ b/src/tools/rbd_ggate/main.cc
@@ -89,7 +89,6 @@ static int do_map(int argc, const char *argv[])
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_DAEMON,

diff --git a/src/tools/rbd_mirror/main.cc b/src/tools/rbd_mirror/main.cc
index a423555eac9a0d1832cb60a66b61092f11514eba..4690883d6e30e558c092620c7cf6878f6aabc597 100644 (file)
--- a/src/tools/rbd_mirror/main.cc
+++ b/src/tools/rbd_mirror/main.cc
@@ -32,7 +32,6 @@ static void handle_signal(int signum)
 int main(int argc, const char **argv)
 {
   std::vector<const char*> args;
-  env_to_vec(args);
   argv_to_vec(argc, argv, args);
 
   auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,

diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index b3a99a09f3fa3c58b91690966f92186d8e222be3..1ef12b481d00de53836dc825951f7cc6e197ce95 100644 (file)
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -665,7 +665,6 @@ static int do_map(int argc, const char *argv[], Config *cfg)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_DAEMON,