global: fix version banner in log on startup

Log banner from global_init().  This puts it at the very top of the log,
right when the daemon starts.

Fixes: #2940
Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 2afb5c0884b9e7a59ad12e4e5c52826695849906..9701bcc9e3a5100f618b7d9f1677af5ac9eea180 100644 (file)
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -233,8 +233,6 @@ int main(int argc, const char **argv)
     usage();
   }
 
-  global_print_banner();
-
   Messenger *messenger = Messenger::create(g_ceph_context,
                                           entity_name_t::MDS(-1), "mds",
                                           getpid());

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index d26481ba433976823fd78b59cecc5d6fff8b2a0b..4903d99e77d39efdfc1641914ea451534275d29f 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -401,8 +401,6 @@ int main(int argc, const char **argv)
   messenger->set_policy_throttler(entity_name_t::TYPE_OSD, &client_throttler);
   messenger->set_policy_throttler(entity_name_t::TYPE_MDS, &client_throttler);
 
-  global_print_banner();
-
   cout << "starting " << g_conf->name << " rank " << rank
        << " at " << ipaddr
        << " mon_data " << g_conf->mon_data

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index d2b648f7e56b7fa9e8fd04d49cc2304531b2eb41..66789509458ccb99ef6b18c7068d709bc4db98ef 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -330,8 +330,6 @@ int main(int argc, const char **argv)
   messenger_hbclient->set_cluster_protocol(CEPH_OSD_PROTOCOL);
   messenger_hbserver->set_cluster_protocol(CEPH_OSD_PROTOCOL);
 
-  global_print_banner();
-
   cout << "starting osd." << whoami
        << " at " << client_messenger->get_myaddr()
        << " osd_data " << g_conf->osd_data

diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 8d119d45670d7c0ab0fd8c393e6e2425c9f8020e..e6df5e3bd2419ec5719972ddba1376b2ab7c7d83 100644 (file)
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -121,6 +121,8 @@ void global_init(std::vector < const char * > *alt_def_args, std::vector < const
     lockdep_register_ceph_context(cct);
   }
   register_assert_context(cct);
+
+  output_ceph_version();
 }
 
 void global_print_banner(void)