]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
global: we need to handle the init_on_startup return value when global_init. 13018/head
authorsongbaisen <song.baisen@zte.com.cn>
Fri, 20 Jan 2017 07:53:15 +0000 (07:53 +0000)
committersongbaisen <song.baisen@zte.com.cn>
Fri, 20 Jan 2017 07:57:18 +0000 (07:57 +0000)
    Signed-off-by:song baisen <song.baisen@zte.com.cn>

src/global/global_init.cc

index 772140adb26bb7f153ce74610e8806a106f93d8d..15ffdfde022981c504fd73f04defbe5e3f891612 100644 (file)
@@ -326,7 +326,10 @@ global_init(std::vector < const char * > *alt_def_args,
   if (code_env == CODE_ENVIRONMENT_DAEMON && !(flags & CINIT_FLAG_NO_DAEMON_ACTIONS))
     output_ceph_version();
 
-  g_ceph_context->crush_location.init_on_startup();
+  if (g_ceph_context->crush_location.init_on_startup()) {
+    cerr << " failed to init_on_startup : " << cpp_strerror(errno) << std::endl;
+    exit(1);
+  }
 
   return boost::intrusive_ptr<CephContext>{g_ceph_context, false};
 }