From: songbaisen <song.baisen@zte.com.cn>
Date: Fri, 20 Jan 2017 07:53:15 +0000 (+0000)
Subject:     global: we need to handle the init_on_startup return value when global_init.
X-Git-Tag: v12.0.0~101^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dec321939c0d02da05483732f3bf2de8f714aeb9;p=ceph.git

global: we need to handle the init_on_startup return value when global_init.

    Signed-off-by:song baisen <song.baisen@zte.com.cn>
---

diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 772140adb26b..15ffdfde0229 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -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};
 }