ReplicatedPG: track incoming pushes with perf counters

Add perf counters tracking the number of inbound pushes along with the
amount of data in each request.

Signed-off-by: Mike Ryan <mike.ryan@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6864c1e42bd34484c13fc5d4a192403332cf4572..7776640ea53c9b3bc0fc412a2ca7db1a01561310 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -991,6 +991,9 @@ void OSD::create_logger()
   osd_plb.add_u64_counter(l_osd_push,      "push");       // push messages
   osd_plb.add_u64_counter(l_osd_push_outb, "push_out_bytes");  // pushed bytes
 
+  osd_plb.add_u64_counter(l_osd_push_in,    "push_in");        // inbound push messages
+  osd_plb.add_u64_counter(l_osd_push_inb,   "push_in_bytes");  // inbound pushed bytes
+
   osd_plb.add_u64_counter(l_osd_rop, "recovery_ops");       // recovery ops (started)
 
   osd_plb.add_fl(l_osd_loadavg, "loadavg");

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index f0b81d9501e16347b06bc355551b4af041593584..76d21e9619d2e76ce143f9a312f40f6f900d45ac 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -94,6 +94,9 @@ enum {
   l_osd_push,
   l_osd_push_outb,
 
+  l_osd_push_in,
+  l_osd_push_inb,
+
   l_osd_rop,
 
   l_osd_loadavg,

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 4df7872d9eac60940ecd816b3ab1e59a079ab78f..79f36592580cafbe75f9e97dd8f2bb01c684095d 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5190,6 +5190,9 @@ void ReplicatedPG::handle_push(OpRequestRef op)
                      onreadable_sync);
   assert(r == 0);
 
+  osd->logger->inc(l_osd_push_in);
+  osd->logger->inc(l_osd_push_inb, m->ops[0].indata.length());
+
   MOSDSubOpReply *reply = new MOSDSubOpReply(
     m, 0, get_osdmap()->get_epoch(), CEPH_OSD_FLAG_ACK);
   assert(entity_name_t::TYPE_OSD == m->get_connection()->peer_type);