log loadavg

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1741 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/osd/OSD.cc b/trunk/ceph/osd/OSD.cc
index 0b95e064e90f9022b478356607dfa82a63fc881f..94a2aad15de708d2896a1140ee91d5d4094dd8bb 100644 (file)
--- a/trunk/ceph/osd/OSD.cc
+++ b/trunk/ceph/osd/OSD.cc
@@ -261,6 +261,8 @@ int OSD::init()
   osd_logtype.add_inc("shdout");
   osd_logtype.add_inc("shdin");
 
+  osd_logtype.add_set("loadavg");
+
   osd_logtype.add_inc("rlsum");
   osd_logtype.add_inc("rlnum");
 
@@ -691,6 +693,15 @@ void OSD::heartbeat()
   utime_t since = now;
   since.sec_ref() -= g_conf.osd_heartbeat_interval;
 
+  // get CPU load avg
+  ifstream in("/proc/loadavg");
+  if (in.is_open()) {
+    float oneminavg;
+    in >> oneminavg;
+    logger->fset("loadavg", oneminavg);
+    in.close();
+  }
+
   // calc my stats
   Mutex::Locker lock(peer_stat_lock);
   _refresh_my_stat(now);