Set correct size for each memory tier

Author: igchor

cachelib/allocator/CacheAllocator-inl.h

@@ -219,7 +219,7 @@ CacheAllocator<CacheTrait>::createNewMemoryAllocator(TierId tid) {
                       config_.getCacheSize(), config_.slabMemoryBaseAddr,
                       createShmCacheOpts(tid))
           .addr,
-      config_.getCacheSize());
+      memoryTierConfigs[tid].getSize());
 }
 
 template <typename CacheTrait>
@@ -230,7 +230,7 @@ CacheAllocator<CacheTrait>::restoreMemoryAllocator(TierId tid) {
       shmManager_
           ->attachShm(detail::kShmCacheName + std::to_string(tid),
             config_.slabMemoryBaseAddr, createShmCacheOpts(tid)).addr,
-      config_.getCacheSize(),
+      memoryTierConfigs[tid].getSize(),
       config_.disableFullCoredump);
 }
 

cachelib/allocator/tests/AllocatorTypeTest.cpp

@@ -390,6 +390,10 @@ TYPED_TEST(BaseAllocatorTest, Nascent) { this->testNascent(); }
 
 TYPED_TEST(BaseAllocatorTest, BasicMultiTier) {this->testBasicMultiTier(); }
 
+TYPED_TEST(BaseAllocatorTest, SingleTierSize) {this->testSingleTierMemoryAllocatorSize(); }
+
+TYPED_TEST(BaseAllocatorTest, SingleTierSizeAnon) {this->testSingleTierMemoryAllocatorSizeAnonymous(); }
+
 namespace { // the tests that cannot be done by TYPED_TEST.
 
 using LruAllocatorTest = BaseAllocatorTest<LruAllocator>;

cachelib/allocator/tests/BaseAllocatorTest.h

@@ -5975,7 +5975,8 @@ class BaseAllocatorTest : public AllocatorTest<AllocatorT> {
     };
 
     typename AllocatorT::Config config;
-    config.setCacheSize(100 * 1024 * 1024); /* 100 MB */
+    static constexpr size_t cacheSize = 100 * 1024 * 1024; /* 100 MB */
+    config.setCacheSize(cacheSize);
     config.enableCachePersistence(folly::sformat("/tmp/multi-tier-test/{}", ::getpid()));
     config.usePosixForShm();
     config.configureMemoryTiers({