perfcounters: use simple names

We don't need to uniquely identify ourselves in the global namespace with
the PerfCounter name.. only in the current process.  Collectd will handle
the per-daemon naming part.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 44133d9b363a352a9c9c968c6e14264c7c1af76c..5bdee5f9989ebb752c37d934815fff82cb2a4315 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -291,11 +291,7 @@ void Client::init()
   
   // logger?
   client_logger_lock.Lock();
-  char s[80];
-  char hostname[80];
-  gethostname(hostname, 79);
-  snprintf(s, sizeof(s), "clients.%s.%d", hostname, getpid());
-  PerfCountersBuilder plb(cct, s, l_c_first, l_c_last);
+  PerfCountersBuilder plb(cct, "client", l_c_first, l_c_last);
   if (client_counters == 0) {
     plb.add_fl_avg(l_c_reply, "reply");
     plb.add_fl_avg(l_c_lat, "lat");

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 2f1528afb47b31a9352428e556e7c1815c804d28..1ec92f9f82aa2bf3904737d2af9703e72c2941ce 100644 (file)
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -47,9 +47,7 @@ MDLog::~MDLog()
 
 void MDLog::create_logger()
 {
-  char name[80];
-  snprintf(name, sizeof(name), "mds.%s.log", g_conf->name.get_id().c_str());
-  PerfCountersBuilder plb(g_ceph_context, name, l_mdl_first, l_mdl_last);
+  PerfCountersBuilder plb(g_ceph_context, "mds_log", l_mdl_first, l_mdl_last);
 
   plb.add_u64_counter(l_mdl_evadd, "evadd");
   plb.add_u64_counter(l_mdl_evex, "evex");

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 4becf6025203d346dbbdd2dd1ab633c3dd5c8046..2a7f5e2e01fbccbee14301294c00f06683213b34 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -194,12 +194,7 @@ void MDS::create_logger()
 {
   dout(10) << "create_logger" << dendl;
   {
-    char name[80];
-    snprintf(name, sizeof(name), "mds.%s.%llu.log",
-            g_conf->name.get_id().c_str(),
-            (unsigned long long) monc->get_global_id());
-    PerfCountersBuilder mds_plb(g_ceph_context, name,
-                             l_mds_first, l_mds_last);
+    PerfCountersBuilder mds_plb(g_ceph_context, "mds", l_mds_first, l_mds_last);
 
     mds_plb.add_u64_counter(l_mds_req, "req"); // FIXME: nobody is actually setting this
     mds_plb.add_u64_counter(l_mds_reply, "reply");
@@ -261,12 +256,7 @@ void MDS::create_logger()
   }
 
   {
-    char name[80];
-    snprintf(name, sizeof(name), "mds.%s.%llu.mem.log",
-            g_conf->name.get_id().c_str(),
-            (unsigned long long) monc->get_global_id());
-    PerfCountersBuilder mdm_plb(g_ceph_context, name,
-                             l_mdm_first, l_mdm_last);
+    PerfCountersBuilder mdm_plb(g_ceph_context, "mds_mem", l_mdm_first, l_mdm_last);
     mdm_plb.add_u64(l_mdm_ino, "ino");
     mdm_plb.add_u64_counter(l_mdm_inoa, "ino+");
     mdm_plb.add_u64_counter(l_mdm_inos, "ino-");

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index c724a722dd7ef0eb35e5cdda6bac712696abd842..c445706776d498a46361ee76449efbc7a79da9c2 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -66,9 +66,7 @@ using namespace std;
 
 void Server::create_logger()
 {
-  char name[80];
-  snprintf(name, sizeof(name), "mds.%s.server.log", g_conf->name.get_id().c_str());
-  PerfCountersBuilder plb(g_ceph_context, name, l_mdss_first, l_mdss_last);
+  PerfCountersBuilder plb(g_ceph_context, "mds_server", l_mdss_first, l_mdss_last);
   plb.add_u64_counter(l_mdss_hcreq,"hcreq"); // handle client req
   plb.add_u64_counter(l_mdss_hsreq, "hsreq"); // slave
   plb.add_u64_counter(l_mdss_hcsess, "hcsess");    // client session

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 90188f0bcacc7386a30da75d81405eaa41efd315..181e984735ba2af276fef78b44346bff7c033f89 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1765,9 +1765,7 @@ void FileStore::start_logger(int whoami, utime_t tare)
   dout(10) << "start_logger" << dendl;
   assert(!logger);
 
-  char name[80];
-  snprintf(name, sizeof(name), "osd.%d.fs.log", whoami);
-  PerfCountersBuilder plb(g_ceph_context, name, l_os_first, l_os_last);
+  PerfCountersBuilder plb(g_ceph_context, "filestore", l_os_first, l_os_last);
 
   plb.add_u64_counter(l_os_in_ops, "in_o");
   //plb.add_u64_counter(l_os_in_bytes, "in_b");

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 59623f86120fe2009df720767a388d1080630818..634b3b783e3555f50d22a28a7a2fe7f5cd661350 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -746,9 +746,7 @@ void OSD::create_logger()
 {
   dout(10) << "create_logger" << dendl;
 
-  char name[80];
-  snprintf(name, sizeof(name), "osd.%d.log", whoami);
-  PerfCountersBuilder osd_plb(g_ceph_context, name, l_osd_first, l_osd_last);
+  PerfCountersBuilder osd_plb(g_ceph_context, "osd", l_osd_first, l_osd_last);
 
   osd_plb.add_u64(l_osd_opq, "opq");       // op queue length (waiting to be processed yet)
   osd_plb.add_u64(l_osd_op_wip, "op_wip");   // rep ops currently being processed (primary)