From: John Spray <john.spray@redhat.com>
Date: Sun, 15 May 2016 11:02:40 +0000 (+0100)
Subject: common: move ceph_version up into collect_sys_info
X-Git-Tag: v11.0.1~60^2~70
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a331234e80c4bf65f754203933d833a1df67743;p=ceph.git

common: move ceph_version up into collect_sys_info

...so that we get this piece of metadata from every
service uniformly.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/common/util.cc b/src/common/util.cc
index 124b9b9c39e0..f330e42fa7fa 100644
--- a/src/common/util.cc
+++ b/src/common/util.cc
@@ -20,6 +20,7 @@
 #include "common/debug.h"
 #include "common/errno.h"
 #include "common/strtol.h"
+#include "common/version.h"
 
 #ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
@@ -213,6 +214,9 @@ static void distro_detect(map<string, string> *m, CephContext *cct)
 
 void collect_sys_info(map<string, string> *m, CephContext *cct)
 {
+  // version
+  (*m)["ceph_version"] = pretty_version_to_str();
+
   // kernel info
   struct utsname u;
   int r = uname(&u);
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index bc18041bf69e..9e00c34ca572 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4976,8 +4976,6 @@ void OSD::_send_boot()
 
 void OSD::_collect_metadata(map<string,string> *pm)
 {
-  (*pm)["ceph_version"] = pretty_version_to_str();
-
   // config info
   (*pm)["osd_data"] = dev_path;
   (*pm)["osd_journal"] = journal_path;