Merge pull request pmem#4 from guptask/reduced_cs_bkgrnd_evictor

Updated stats structure

Author: byrnedj

cachelib/allocator/BackgroundEvictor-inl.h

@@ -39,10 +39,11 @@ void BackgroundEvictor<CacheT>::work() {
       while (auto entry = tasks_.try_dequeue()) {
         auto [pid, cid] = entry.value();
         auto batch = strategy_->calculateBatchSize(cache_, tid_, pid, cid);
+        stats.evictionSize.add(batch);
         auto evicted = BackgroundEvictorAPIWrapper<CacheT>::traverseAndEvictItems(cache_,
                 tid_,pid,cid,batch);
-        numEvictedItemsFromSchedule_.fetch_add(1, std::memory_order_relaxed);
-        runCount_.fetch_add(1, std::memory_order_relaxed);
+        stats.numEvictedItemsFromSchedule.inc();
+        stats.numTraversals.inc();
       }
     } else {
       for (const auto pid : cache_.getRegularPoolIds()) {
@@ -71,6 +72,7 @@ void BackgroundEvictor<CacheT>::checkAndRun(PoolId pid) {
         continue;
       }
 
+      stats.evictionSize.add(batch);
       //try evicting BATCH items from the class in order to reach free target
       auto evicted =
           BackgroundEvictorAPIWrapper<CacheT>::traverseAndEvictItems(cache_,
@@ -84,19 +86,21 @@ void BackgroundEvictor<CacheT>::checkAndRun(PoolId pid) {
           evictions_per_class_[cid_id] = 0;
       }
   }
-  runCount_.fetch_add(1, std::memory_order_relaxed);
-  numEvictedItems_.fetch_add(evictions, std::memory_order_relaxed);
-  totalClasses_.fetch_add(classes, std::memory_order_relaxed);
+  stats.numTraversals.inc();
+  stats.numEvictedItems.add(evictions);
+  stats.totalClasses.add(classes);
 }
 
 template <typename CacheT>
-BackgroundEvictorStats BackgroundEvictor<CacheT>::getStats() const noexcept {
-  BackgroundEvictorStats stats;
-  stats.numEvictedItems = numEvictedItems_.load(std::memory_order_relaxed);
-  stats.runCount = runCount_.load(std::memory_order_relaxed);
-  stats.numEvictedItemsFromSchedule = numEvictedItemsFromSchedule_.load(std::memory_order_relaxed);
-  stats.totalClasses = totalClasses_.load(std::memory_order_relaxed);
-  return stats;
+BackgroundEvictionStats BackgroundEvictor<CacheT>::getStats() const noexcept {
+  BackgroundEvictionStats evicStats;
+  evicStats.numEvictedItems = stats.numEvictedItems.get();
+  evicStats.numEvictedItemsFromSchedule = stats.numEvictedItemsFromSchedule.get();
+  evicStats.runCount = stats.numTraversals.get();
+  evicStats.evictionSize = stats.evictionSize.get();
+  evicStats.totalClasses = stats.totalClasses.get();
+
+  return evicStats;
 }
 
 template <typename CacheT>

cachelib/allocator/BackgroundEvictor.h

@@ -22,6 +22,7 @@
 #include "cachelib/allocator/CacheStats.h"
 #include "cachelib/common/PeriodicWorker.h"
 #include "cachelib/allocator/BackgroundEvictorStrategy.h"
+#include "cachelib/common/AtomicCounter.h"
 
 
 namespace facebook {
@@ -38,6 +39,23 @@ struct BackgroundEvictorAPIWrapper {
   }
 };
 
+struct BackgroundEvictorStats {
+  // items evicted
+  AtomicCounter numEvictedItems{0};
+
+  // items evicted from schedule
+  AtomicCounter numEvictedItemsFromSchedule{0};
+
+  // traversals
+  AtomicCounter numTraversals{0};
+
+  // total class size
+  AtomicCounter totalClasses{0};
+
+  // item eviction size
+  AtomicCounter evictionSize{0};
+};
+
 // Periodic worker that evicts items from tiers in batches
 // The primary aim is to reduce insertion times for new items in the
 // cache
@@ -58,10 +76,12 @@ class BackgroundEvictor : public PeriodicWorker {
   void schedule(size_t pid, size_t cid) {
       tasks_.enqueue(std::make_pair(pid,cid));
   }
-  BackgroundEvictorStats getStats() const noexcept;
+  BackgroundEvictionStats getStats() const noexcept;
   std::map<uint32_t,uint64_t> getClassStats() const noexcept;
 
  private:
+   std::map<uint32_t,uint64_t> evictions_per_class_;
+
   // cache allocator's interface for evicting
 
   using Item = typename Cache::Item;
@@ -74,12 +94,8 @@ class BackgroundEvictor : public PeriodicWorker {
   // implements the actual logic of running the background evictor
   void work() override final;
   void checkAndRun(PoolId pid);
- 
-  std::map<uint32_t,uint64_t> evictions_per_class_;
-  std::atomic<uint64_t> numEvictedItems_{0};
-  std::atomic<uint64_t> numEvictedItemsFromSchedule_{0};
-  std::atomic<uint64_t> runCount_{0};
-  std::atomic<uint64_t> totalClasses_{0};
+
+  BackgroundEvictorStats stats;
 };
 } // namespace cachelib
 } // namespace facebook

cachelib/allocator/CacheAllocator-inl.h

@@ -3642,7 +3642,7 @@ GlobalCacheStats CacheAllocator<CacheTrait>::getGlobalCacheStats() const {
   ret.nvmCacheEnabled = nvmCache_ ? nvmCache_->isEnabled() : false;
   ret.nvmUpTime = currTime - getNVMCacheCreationTime();
   ret.reaperStats = getReaperStats();
-  ret.backgroundEvictorStats = getBackgroundEvictorStats();
+  ret.evictionStats = getBackgroundEvictorStats();
   ret.numActiveHandles = getNumActiveHandles();
 
   return ret;

cachelib/allocator/CacheAllocator.h

@@ -1044,8 +1044,8 @@ class CacheAllocator : public CacheBase {
   }
 
   // returns the background evictor
-  BackgroundEvictorStats getBackgroundEvictorStats() const {
-    auto stats = backgroundEvictor_ ? backgroundEvictor_->getStats() : BackgroundEvictorStats{};
+  BackgroundEvictionStats getBackgroundEvictorStats() const {
+    auto stats = backgroundEvictor_ ? backgroundEvictor_->getStats() : BackgroundEvictionStats{};
     return stats;
   }
 

cachelib/allocator/CacheStats.h

@@ -285,8 +285,8 @@ struct ReaperStats {
   uint64_t avgTraversalTimeMs{0};
 };
 
-// Stats for background evictor
-struct BackgroundEvictorStats {
+// Eviction Stats
+struct BackgroundEvictionStats {
   // the number of items this worker evicted by looking at pools/classes stats
   uint64_t numEvictedItems{0};
 
@@ -296,10 +296,11 @@ struct BackgroundEvictorStats {
   // number of times we went executed the thread //TODO: is this def correct?
   uint64_t runCount{0};
 
+  // total number of classes
   uint64_t totalClasses{0};
 
-
-
+  // eviction size
+  uint64_t evictionSize{0};
 };
 
 // CacheMetadata type to export
@@ -322,6 +323,9 @@ struct Stats;
 // Stats that apply globally in cache and
 // the ones that are aggregated over all pools
 struct GlobalCacheStats {
+  // background eviction stats
+  BackgroundEvictionStats evictionStats;
+
   // number of calls to CacheAllocator::find
   uint64_t numCacheGets{0};
 
@@ -486,9 +490,6 @@ struct GlobalCacheStats {
 
   // stats related to the reaper
   ReaperStats reaperStats;
-  
-  // stats related to the background evictor
-  BackgroundEvictorStats backgroundEvictorStats;
 
   uint64_t numNvmRejectsByExpiry{};
   uint64_t numNvmRejectsByClean{};

cachelib/cachebench/cache/Cache-inl.h

@@ -527,14 +527,25 @@ Stats Cache<Allocator>::getStats() const {
   const auto navyStats = cache_->getNvmCacheStatsMap();
 
   Stats ret;
+  ret.backgndEvicStats.nEvictedItems =
+            cacheStats.evictionStats.numEvictedItems;
+  ret.backgndEvicStats.nEvictedItemsFromSchedule =
+            cacheStats.evictionStats.numEvictedItemsFromSchedule;
+  ret.backgndEvicStats.nTraversals =
+            cacheStats.evictionStats.runCount;
+  ret.backgndEvicStats.nClasses =
+            cacheStats.evictionStats.totalClasses;
+  ret.backgndEvicStats.evictionSize =
+            cacheStats.evictionStats.evictionSize;
+
   ret.numEvictions = aggregate.numEvictions();
   ret.numItems = aggregate.numItems();
   ret.allocAttempts = cacheStats.allocAttempts;
   ret.allocFailures = cacheStats.allocFailures;
-  
-  ret.numBackgroundEvictions = cacheStats.backgroundEvictorStats.numEvictedItems;
-  ret.numBackgroundEvictionsFromSchedule = cacheStats.backgroundEvictorStats.numEvictedItemsFromSchedule;
-  ret.numBackgroundEvictorRuns = cacheStats.backgroundEvictorStats.runCount;
+
+  ret.numCacheGets = cacheStats.numCacheGets;
+  ret.numCacheGetMiss = cacheStats.numCacheGetMiss;
+  ret.numRamDestructorCalls = cacheStats.numRamDestructorCalls;
   ret.numNvmGets = cacheStats.numNvmGets;
   ret.numNvmGetMiss = cacheStats.numNvmGetMiss;
   ret.numNvmGetCoalesced = cacheStats.numNvmGetCoalesced;

cachelib/cachebench/cache/CacheStats.h

@@ -25,18 +25,33 @@ DECLARE_bool(report_api_latency);
 namespace facebook {
 namespace cachelib {
 namespace cachebench {
+
+struct BackgroundEvictionStats {
+  // the number of items this worker evicted by looking at pools/classes stats
+  uint64_t nEvictedItems{0};
+
+  // the number of items this worker evicted for pools/classes requested by schedule call
+  uint64_t nEvictedItemsFromSchedule{0};
+
+  // number of times we went executed the thread //TODO: is this def correct?
+  uint64_t nTraversals{0};
+
+  // number of classes
+  uint64_t nClasses{0};
+
+  // size of evicted items
+  uint64_t evictionSize{0};
+};
+
 struct Stats {
+  BackgroundEvictionStats backgndEvicStats;
+
   uint64_t numEvictions{0};
   uint64_t numItems{0};
 
   uint64_t allocAttempts{0};
   uint64_t allocFailures{0};
 
-  uint64_t numBackgroundEvictions{0};
-  uint64_t numBackgroundEvictionsFromSchedule{0};
-  uint64_t numBackgroundEvictorRuns{0};
-  uint64_t numBackgroundEvictorClasses{0};
-
   uint64_t numCacheGets{0};
   uint64_t numCacheGetMiss{0};
   uint64_t numRamDestructorCalls{0};
@@ -121,14 +136,17 @@ struct Stats {
                           invertPctFn(allocFailures, allocAttempts))
         << std::endl;
     out << folly::sformat("RAM Evictions : {:,}", numEvictions) << std::endl;
-    
 
-    out << folly::sformat("Background Tier 0 Evictions : {:,}", numBackgroundEvictions) << std::endl;
-    out << folly::sformat("Background Tier 0 Evictions from schedule() : {:,}", numBackgroundEvictionsFromSchedule) << std::endl;
-    
-    out << folly::sformat("Background Tier 0 Eviction Runs : {:,}", numBackgroundEvictorRuns) << std::endl;
-    
-    out << folly::sformat("Background Tier 0 Total Classes Searched : {:,}", numBackgroundEvictorClasses) << std::endl;
+    out << folly::sformat("Tier 0 Background Evicted items : {:,}",
+                            backgndEvicStats.nEvictedItems) << std::endl;
+    out << folly::sformat("Tier 0 Background Evicted items from schedule : {:,}",
+                            backgndEvicStats.nEvictedItemsFromSchedule) << std::endl;
+    out << folly::sformat("Tier 0 Background Traversals : {:,}",
+                            backgndEvicStats.nTraversals) << std::endl;
+    out << folly::sformat("Tier 0 Total Classes : {:,}",
+                            backgndEvicStats.nClasses) << std::endl;
+    out << folly::sformat("Tier 0 Background Evicted Size : {:,}",
+                            backgndEvicStats.evictionSize) << std::endl;
 
     if (numCacheGets >= 0) {
       out << folly::sformat("Cache Gets    : {:,}", numCacheGets) << std::endl;