From: Sage Weil <sage@inktank.com>
Date: Mon, 17 Feb 2014 20:20:28 +0000 (-0800)
Subject: osd: l_osd_tier_[dirty|clean]
X-Git-Tag: v0.78~164^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dbec1096f4ea57f55c51b6d4081a094c6d17daa0;p=ceph.git

osd: l_osd_tier_[dirty|clean]

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 356e576a9a4..93f9f288ab3 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1441,6 +1441,9 @@ void OSD::create_logger()
   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");
+
   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 5a9977a237e..e3c2e1884e4 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -131,6 +131,9 @@ enum {
   l_osd_tier_try_flush_fail,
   l_osd_tier_evict,
   l_osd_tier_whiteout,
+  l_osd_tier_dirty,
+  l_osd_tier_clean,
+
   l_osd_last,
 };
 
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 376d69e18e0..f5d8094da1c 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4574,10 +4574,12 @@ void ReplicatedPG::make_writeable(OpContext *ctx)
       assert(ctx->new_obs.oi.is_dirty());
       ctx->new_obs.oi.clear_flag(object_info_t::FLAG_DIRTY);
       --ctx->delta_stats.num_objects_dirty;
+      osd->logger->inc(l_osd_tier_clean);
     } else if (!ctx->new_obs.oi.test_flag(object_info_t::FLAG_DIRTY)) {
       dout(20) << " setting DIRTY flag" << dendl;
       ctx->new_obs.oi.set_flag(object_info_t::FLAG_DIRTY);
       ++ctx->delta_stats.num_objects_dirty;
+      osd->logger->inc(l_osd_tier_dirty);
     }
   }
 
@@ -5955,6 +5957,8 @@ int ReplicatedPG::try_flush_mark_clean(FlushOpRef fop)
 
   finish_ctx(ctx, pg_log_entry_t::CLEAN);
 
+  osd->logger->inc(l_osd_tier_clean);
+
   if (!fop->dup_ops.empty()) {
     dout(20) << __func__ << " queueing dups for " << ctx->at_version << dendl;
     list<OpRequestRef>& ls = waiting_for_ondisk[ctx->at_version];