no online eviction

Author: byrnedj

cachelib/allocator/CacheAllocator-inl.h

@@ -478,7 +478,7 @@ CacheAllocator<CacheTrait>::allocateInternalTier(TierId tid,
     backgroundEvictor_[backgroundWorkerId(tid, pid, cid, backgroundEvictor_.size())]->wakeUp();
   }
 
-  if (memory == nullptr && !evict) {
+  if ((memory == nullptr && !evict) || (memory == nullptr && config_.noOnlineEviction)) {
     return {};
   } else if (memory == nullptr) {
     memory = findEviction(tid, pid, cid);
@@ -2033,7 +2033,7 @@ CacheAllocator<CacheTrait>::getNextCandidate(TierId tid,
   Item* syncItem = nullptr;
   bool chainedItem = false;
   auto& mmContainer = getMMContainer(tid, pid, cid);
-  bool lastTier = tid+1 >= getNumTiers();
+  bool lastTier = tid+1 >= getNumTiers() || config_.noOnlineEviction;
 
   mmContainer.withEvictionIterator([this, tid, pid, cid, &candidate,
                                     &toRecycle, &toRecycleParent, &syncItem,

cachelib/allocator/CacheAllocatorConfig.h

@@ -313,6 +313,8 @@ class CacheAllocatorConfig {
 
   // Insert items to first free memory tier
   CacheAllocatorConfig& enableInsertToFirstFreeTier();
+  
+  CacheAllocatorConfig& enableNoOnlineEviction();
 
   // Passes in a callback to initialize an event tracker when the allocator
   // starts
@@ -535,6 +537,8 @@ class CacheAllocatorConfig {
   // from the bottom one if memory cache is full
   bool insertToFirstFreeTier = false;
 
+  bool noOnlineEviction = false;
+
   // the number of tries to search for an item to evict
   // 0 means it's infinite
   unsigned int evictionSearchTries{50};
@@ -676,6 +680,12 @@ CacheAllocatorConfig<T>& CacheAllocatorConfig<T>::enableInsertToFirstFreeTier()
   return *this;
 }
 
+template <typename T>
+CacheAllocatorConfig<T>& CacheAllocatorConfig<T>::enableNoOnlineEviction() {
+  noOnlineEviction = true;
+  return *this;
+}
+
 template <typename T>
 CacheAllocatorConfig<T>& CacheAllocatorConfig<T>::setCacheName(
     const std::string& _cacheName) {
@@ -1256,6 +1266,7 @@ std::map<std::string, std::string> CacheAllocatorConfig<T>::serialize() const {
   configMap["delayCacheWorkersStart"] =
       delayCacheWorkersStart ? "true" : "false";
   configMap["insertToFirstFreeTier"] = std::to_string(insertToFirstFreeTier);
+  configMap["noOnlineEviction"] = std::to_string(noOnlineEviction);
   mergeWithPrefix(configMap, throttleConfig.serialize(), "throttleConfig");
   mergeWithPrefix(configMap,
                   chainedItemAccessConfig.serialize(),

cachelib/cachebench/cache/Cache-inl.h

@@ -105,6 +105,7 @@ Cache<Allocator>::Cache(const CacheConfig& config,
   }
 
   allocatorConfig_.insertToFirstFreeTier = config_.insertToFirstFreeTier;
+  allocatorConfig_.noOnlineEviction = config_.noOnlineEviction;
 
   auto cleanupGuard = folly::makeGuard([&] {
     if (!nvmCacheFilePath_.empty()) {

cachelib/cachebench/util/CacheConfig.cpp

@@ -51,6 +51,7 @@ CacheConfig::CacheConfig(const folly::dynamic& configJson) {
   JSONSetVal(configJson, useCombinedLockForIterators);
 
   JSONSetVal(configJson, insertToFirstFreeTier);
+  JSONSetVal(configJson, noOnlineEviction);
 
   JSONSetVal(configJson, lru2qHotPct);
   JSONSetVal(configJson, lru2qColdPct);

cachelib/cachebench/util/CacheConfig.h

@@ -99,6 +99,7 @@ struct CacheConfig : public JSONConfig {
   bool useCombinedLockForIterators{true};
 
   bool insertToFirstFreeTier{false};
+  bool noOnlineEviction{false};
 
   // LRU param
   uint64_t lruIpSpec{0};