osd: l_osd_tier_evict

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index d725c6d63a23e32fed771e67097fdabcde80a6af..ac458c777429640cbeedfd5f52c976034ea19c8f 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1439,6 +1439,7 @@ void OSD::create_logger()
   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");
   logger = osd_plb.create_perf_counters();
   cct->get_perfcounters_collection()->add(logger);
 }

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 73bbaad1143e4ee7765badf13121bbf5a0dff0bc..1b684652fdc61b40f6372a9b7f53ccaa80851280 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -129,6 +129,7 @@ enum {
   l_osd_tier_flush_fail,
   l_osd_tier_try_flush,
   l_osd_tier_try_flush_fail,
+  l_osd_tier_evict,
   l_osd_last,
 };
 

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index ae31ed70e383236bcf32f48db1857e1c20c74205..cc1bf6c5be1a4f0a6d414864a0e4bdf4cfb12eee 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3165,6 +3165,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
            break;
        }
        result = _delete_head(ctx, true);
+       osd->logger->inc(l_osd_tier_evict);
       }
       break;
 
@@ -10481,6 +10482,7 @@ bool ReplicatedPG::agent_maybe_evict(ObjectContextRef& obc)
   assert(r == 0);
   finish_ctx(ctx, pg_log_entry_t::DELETE);
   simple_repop_submit(repop);
+  osd->logger->inc(l_osd_tier_evict);
   return true;
 }