Merge pull request #3889 from XinzeChi/wip-tier-stat

osd: add l_osd_op_cache_hit perf counter for cache pool

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/osd/OSD.cc
index 0fd3ec9eab4b43f4d991f62aa61bb531d7f792f9,f91ac16f33b406f2bdd9942c1b067a30454c9fde..79b099b1a130016f27a2d1ed3f026cf3800cc378
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -2138,37 -2117,40 +2138,39 @@@ void OSD::create_logger(
    osd_plb.add_u64(l_osd_pg_stray, "numpg_stray", "Placement groups ready to be deleted from this osd");   // num stray pgs
    osd_plb.add_u64(l_osd_hb_to, "heartbeat_to_peers", "Heartbeat (ping) peers we send to");     // heartbeat peers we send to
    osd_plb.add_u64(l_osd_hb_from, "heartbeat_from_peers", "Heartbeat (ping) peers we recv from"); // heartbeat peers we recv from
 -  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
 -
 -  osd_plb.add_u64(l_osd_stat_bytes, "stat_bytes");
 -  osd_plb.add_u64(l_osd_stat_bytes_used, "stat_bytes_used");
 -  osd_plb.add_u64(l_osd_stat_bytes_avail, "stat_bytes_avail");
 -
 -  osd_plb.add_u64_counter(l_osd_copyfrom, "copyfrom");
 -
 -  osd_plb.add_u64_counter(l_osd_tier_promote, "tier_promote");
 -  osd_plb.add_u64_counter(l_osd_tier_flush, "tier_flush");
 -  osd_plb.add_u64_counter(l_osd_tier_flush_fail, "tier_flush_fail");
 -  osd_plb.add_u64_counter(l_osd_tier_try_flush, "tier_try_flush");
 -  osd_plb.add_u64_counter(l_osd_tier_try_flush_fail, "tier_try_flush_fail");
 -  osd_plb.add_u64_counter(l_osd_tier_evict, "tier_evict");
 -  osd_plb.add_u64_counter(l_osd_tier_whiteout, "tier_whiteout");
 -  osd_plb.add_u64_counter(l_osd_tier_dirty, "tier_dirty");
 -  osd_plb.add_u64_counter(l_osd_tier_clean, "tier_clean");
 -  osd_plb.add_u64_counter(l_osd_tier_delay, "tier_delay");
 -  osd_plb.add_u64_counter(l_osd_tier_proxy_read, "tier_proxy_read");
 -
 -  osd_plb.add_u64_counter(l_osd_agent_wake, "agent_wake");
 -  osd_plb.add_u64_counter(l_osd_agent_skip, "agent_skip");
 -  osd_plb.add_u64_counter(l_osd_agent_flush, "agent_flush");
 -  osd_plb.add_u64_counter(l_osd_agent_evict, "agent_evict");
 -
 -  osd_plb.add_u64_counter(l_osd_object_ctx_cache_hit, "object_ctx_cache_hit");
 -  osd_plb.add_u64_counter(l_osd_object_ctx_cache_total, "object_ctx_cache_total");
 +  osd_plb.add_u64_counter(l_osd_map, "map_messages", "OSD map messages");           // osdmap messages
 +  osd_plb.add_u64_counter(l_osd_mape, "map_message_epochs", "OSD map epochs");         // osdmap epochs
 +  osd_plb.add_u64_counter(l_osd_mape_dup, "map_message_epoch_dups", "OSD map duplicates"); // dup osdmap epochs
 +  osd_plb.add_u64_counter(l_osd_waiting_for_map, "messages_delayed_for_map", "Operations waiting for OSD map"); // dup osdmap epochs
 +
 +  osd_plb.add_u64(l_osd_stat_bytes, "stat_bytes", "OSD size");
 +  osd_plb.add_u64(l_osd_stat_bytes_used, "stat_bytes_used", "Used space");
 +  osd_plb.add_u64(l_osd_stat_bytes_avail, "stat_bytes_avail", "Available space");
 +
 +  osd_plb.add_u64_counter(l_osd_copyfrom, "copyfrom", "Rados \"copy-from\" operations");
 +
 +  osd_plb.add_u64_counter(l_osd_tier_promote, "tier_promote", "Tier promotions");
 +  osd_plb.add_u64_counter(l_osd_tier_flush, "tier_flush", "Tier flushes");
 +  osd_plb.add_u64_counter(l_osd_tier_flush_fail, "tier_flush_fail", "Failed tier flushes");
 +  osd_plb.add_u64_counter(l_osd_tier_try_flush, "tier_try_flush", "Tier flush attempts");
 +  osd_plb.add_u64_counter(l_osd_tier_try_flush_fail, "tier_try_flush_fail", "Failed tier flush attempts");
 +  osd_plb.add_u64_counter(l_osd_tier_evict, "tier_evict", "Tier evictions");
 +  osd_plb.add_u64_counter(l_osd_tier_whiteout, "tier_whiteout", "Tier whiteouts");
 +  osd_plb.add_u64_counter(l_osd_tier_dirty, "tier_dirty", "Dirty tier flag set");
 +  osd_plb.add_u64_counter(l_osd_tier_clean, "tier_clean", "Dirty tier flag cleaned");
 +  osd_plb.add_u64_counter(l_osd_tier_delay, "tier_delay", "Tier delays (agent waiting)");
 +  osd_plb.add_u64_counter(l_osd_tier_proxy_read, "tier_proxy_read", "Tier proxy reads");
 +
 +  osd_plb.add_u64_counter(l_osd_agent_wake, "agent_wake", "Tiering agent wake up");
 +  osd_plb.add_u64_counter(l_osd_agent_skip, "agent_skip", "Objects skipped by agent");
 +  osd_plb.add_u64_counter(l_osd_agent_flush, "agent_flush", "Tiering agent flushes");
 +  osd_plb.add_u64_counter(l_osd_agent_evict, "agent_evict", "Tiering agent evictions");
 +
 +  osd_plb.add_u64_counter(l_osd_object_ctx_cache_hit, "object_ctx_cache_hit", "Object context cache hits");
 +  osd_plb.add_u64_counter(l_osd_object_ctx_cache_total, "object_ctx_cache_total", "Object context cache lookups");
  
+   osd_plb.add_u64_counter(l_osd_op_cache_hit, "op_cache_hit");
+ 
    logger = osd_plb.create_perf_counters();
    cct->get_perfcounters_collection()->add(logger);
  }

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge