]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cconf: do not common_init_finish
authorSage Weil <sage@newdream.net>
Wed, 21 Sep 2011 00:01:38 +0000 (17:01 -0700)
committerSage Weil <sage@newdream.net>
Wed, 21 Sep 2011 00:01:38 +0000 (17:01 -0700)
All that common_init_finish() does is indicate that we're done initializing
and we're allowed to start up extra threads and do the wonky things that
daemons like to do (like set up the admin socket).  Since cconf is just
examining the config, we don't want to do any of that.

Signed-off-by: Sage Weil <sage@newdream.net>
src/cconf.cc

index 90c2cc8b4142dac8a158d9431bb6bd3d27a4f672..3661d7ab104bf81ac05a73d3785676c2db94392c 100644 (file)
@@ -157,7 +157,11 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
   global_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
-  common_init_finish(g_ceph_context);
+
+  // do not common_init_finish(); do not start threads; do not do any of thing
+  // wonky things the daemon whose conf we are examining would do (like initialize
+  // the admin socket).
+  //common_init_finish(g_ceph_context);
 
   std::string val;
   for (std::vector<const char*>::iterator i = args.begin(); i != args.end(); ) {