OSD: add perfcounter tracking messages delayed pending a map

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e0f00b92536ecdacbeeb5aedf1bdb2bccb0dbb45..5570338913e48d90f5e7ae8b112a2f2cc9c94aa2 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1400,6 +1400,8 @@ void OSD::create_logger()
   osd_plb.add_u64_counter(l_osd_map, "map_messages");           // osdmap messages
   osd_plb.add_u64_counter(l_osd_mape, "map_message_epochs");         // osdmap epochs
   osd_plb.add_u64_counter(l_osd_mape_dup, "map_message_epoch_dups"); // dup osdmap epochs
+  osd_plb.add_u64_counter(l_osd_waiting_for_map,
+                         "messages_delayed_for_map"); // dup osdmap epochs
 
   logger = osd_plb.create_perf_counters();
   g_ceph_context->get_perfcounters_collection()->add(logger);
@@ -4764,6 +4766,7 @@ void OSD::wait_for_new_map(OpRequestRef op)
     monc->renew_subs();
   }
   
+  logger->inc(l_osd_waiting_for_map);
   waiting_for_osdmap.push_back(op);
   op->mark_delayed("wait for new map");
 }

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index cbd61b0a7bcbcffdba394967a6491674e67293b7..383ef611ef4a4976a901624ccfddfd0ae8bef6f0 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -112,6 +112,7 @@ enum {
   l_osd_mape,
   l_osd_mape_dup,
 
+  l_osd_waiting_for_map,
   l_osd_last,
 };