Refactor Shared Cache configuration

ydb/core/cms/console/ya.make

@@ -69,8 +69,6 @@ SRCS(
     modifications_validator.cpp
     modifications_validator.h
     net_classifier_updater.cpp
-    shared_cache_configurator.cpp
-    shared_cache_configurator.h
     tx_processor.cpp
     tx_processor.h
     util.cpp

ydb/core/driver_lib/run/kikimr_services_initializers.cpp

@@ -42,7 +42,6 @@
 #include <ydb/core/cms/console/immediate_controls_configurator.h>
 #include <ydb/core/cms/console/jaeger_tracing_configurator.h>
 #include <ydb/core/cms/console/log_settings_configurator.h>
-#include <ydb/core/cms/console/shared_cache_configurator.h>
 #include <ydb/core/cms/console/validators/core_validators.h>
 #include <ydb/core/cms/http.h>
 
@@ -1092,38 +1091,17 @@ TSharedCacheInitializer::TSharedCacheInitializer(const TKikimrRunConfig& runConf
 void TSharedCacheInitializer::InitializeServices(
         NActors::TActorSystemSetup* setup,
         const NKikimr::TAppData* appData) {
-    auto config = MakeHolder<TSharedPageCacheConfig>();
-
-    NKikimrSharedCache::TSharedCacheConfig cfg;
+    NKikimrSharedCache::TSharedCacheConfig config;
     if (Config.HasBootstrapConfig() && Config.GetBootstrapConfig().HasSharedCacheConfig()) {
-        cfg.MergeFrom(Config.GetBootstrapConfig().GetSharedCacheConfig());
+        config.MergeFrom(Config.GetBootstrapConfig().GetSharedCacheConfig());
     }
     if (Config.HasSharedCacheConfig()) {
-        cfg.MergeFrom(Config.GetSharedCacheConfig());
+        config.MergeFrom(Config.GetSharedCacheConfig());
     }
 
-    if (cfg.HasMemoryLimit() && cfg.GetMemoryLimit() != 0) {
-        // config limit is optional
-        // if preserved apply both memory controller limit and config limit
-        config->LimitBytes = cfg.GetMemoryLimit();
-    } else {
-        config->LimitBytes = {};
-    }
-    config->TotalAsyncQueueInFlyLimit = cfg.GetAsyncQueueInFlyLimit();
-    config->TotalScanQueueInFlyLimit = cfg.GetScanQueueInFlyLimit();
-    config->ReplacementPolicy = cfg.GetReplacementPolicy();
-    config->ActivePagesReservationPercent = cfg.GetActivePagesReservationPercent();
-
-    TIntrusivePtr<::NMonitoring::TDynamicCounters> tabletGroup = GetServiceCounters(appData->Counters, "tablets");
-    TIntrusivePtr<::NMonitoring::TDynamicCounters> sausageGroup = tabletGroup->GetSubgroup("type", "S_CACHE");
-    config->Counters = new TSharedPageCacheCounters(sausageGroup);
-
-    setup->LocalServices.push_back(std::pair<TActorId, TActorSetupCmd>(MakeSharedPageCacheId(0),
-        TActorSetupCmd(CreateSharedPageCache(std::move(config)), TMailboxType::ReadAsFilled, appData->UserPoolId)));
-
-    auto *configurator = NConsole::CreateSharedCacheConfigurator();
-    setup->LocalServices.emplace_back(TActorId(),
-                                      TActorSetupCmd(configurator, TMailboxType::HTSwap, appData->UserPoolId));
+    auto* actor = NSharedCache::CreateSharedPageCache(config, appData->Counters);
+    setup->LocalServices.emplace_back(NSharedCache::MakeSharedPageCacheId(0),
+        TActorSetupCmd(actor, TMailboxType::ReadAsFilled, appData->UserPoolId));
 }
 
 // TBlobCacheInitializer

ydb/core/memory_controller/memory_controller_ut.cpp

@@ -8,6 +8,7 @@
 namespace NKikimr::NMemory {
 
 using namespace Tests;
+using namespace NSharedCache;
 
 namespace {
 
@@ -77,8 +78,8 @@ class TWithMemoryControllerServer : public TServer {
                 nodeIndex);
         }
 
-        SharedPageCacheCounters = MakeIntrusive<TSharedPageCacheCounters>(Runtime->GetDynamicCounters());
-        MemoryControllerCounters = GetServiceCounters(Runtime->GetDynamicCounters(), "utils")->FindSubgroup("component", "memory_controller");
+        SharedPageCacheCounters = MakeHolder<TSharedPageCacheCounters>(GetServiceCounters(Runtime->GetDynamicCounters(), "tablets")->GetSubgroup("type", "S_CACHE"));
+        MemoryControllerCounters = GetServiceCounters(Runtime->GetDynamicCounters(), "utils")->GetSubgroup("component", "memory_controller");
 
         Runtime->SetLogPriority(NKikimrServices::MEMORY_CONTROLLER, NLog::PRI_TRACE);
         Runtime->SetLogPriority(NKikimrServices::TABLET_SAUSAGECACHE, NLog::PRI_TRACE);
@@ -89,7 +90,7 @@ class TWithMemoryControllerServer : public TServer {
     TIntrusivePtr<TProcessMemoryInfoProvider> ProcessMemoryInfoProvider;
 
 public:
-    TIntrusivePtr<TSharedPageCacheCounters> SharedPageCacheCounters;
+    THolder<TSharedPageCacheCounters> SharedPageCacheCounters;
     TIntrusivePtr<::NMonitoring::TDynamicCounters> MemoryControllerCounters;
     TProcessMemoryInfo* ProcessMemoryInfo;
 };
@@ -332,7 +333,7 @@ Y_UNIT_TEST(SharedCache_ConfigLimit) {
 
     auto memoryControllerConfig = serverSettings.AppConfig->MutableMemoryControllerConfig();
     memoryControllerConfig->SetHardLimitBytes(300_MB);
-    serverSettings.CacheParams.Shared = 100_MB;
+    serverSettings.AppConfig->MutableSharedCacheConfig()->SetMemoryLimit(100_MB);
 
     auto server = MakeIntrusive<TWithMemoryControllerServer>(serverSettings);
     auto& runtime = *server->GetRuntime();

ydb/core/mind/node_broker_ut.cpp

@@ -159,9 +159,9 @@ void SetupServices(TTestActorRuntime &runtime,
         SetupNodeWhiteboard(runtime, nodeIndex);
         SetupTabletResolver(runtime, nodeIndex);
         SetupResourceBroker(runtime, nodeIndex, {});
-        SetupSharedPageCache(runtime, nodeIndex, NFake::TCaches{
-            .Shared = 1,
-        });
+        NSharedCache::TSharedCacheConfig sharedCacheConfig;
+        sharedCacheConfig.SetMemoryLimit(0);
+        SetupSharedPageCache(runtime, nodeIndex, sharedCacheConfig);
         SetupSchemeCache(runtime, nodeIndex, DOMAIN_NAME);
     }
 

ydb/core/tablet_flat/flat_executor_bootlogic.cpp

@@ -181,7 +181,7 @@ NBoot::TSpawned TExecutorBootLogic::LoadPages(NBoot::IStep *step, TAutoPtr<NPage
     Y_ABORT_UNLESS(success, "IPageCollection queued twice for loading");
 
     Ops->Send(
-        MakeSharedPageCacheId(),
+        NSharedCache::MakeSharedPageCacheId(),
         new NSharedCache::TEvRequest(
             NBlockIO::EPriority::Fast,
             req,

ydb/core/tablet_flat/flat_executor_ut.cpp

@@ -1,5 +1,6 @@
 #include "flat_dbase_sz_env.h"
 #include "flat_executor_ut_common.h"
+#include <ydb/core/base/counters.h>
 
 namespace NKikimr {
 namespace NTabletFlatExecutor {
@@ -571,6 +572,9 @@ class TTestFlatTablet : public TActor<TTestFlatTablet>, public TTabletExecutedFl
     }
 };
 
+THolder<TSharedPageCacheCounters> GetSharedPageCounters(TMyEnvBase& env) {
+    return MakeHolder<TSharedPageCacheCounters>(GetServiceCounters(env->GetDynamicCounters(), "tablets")->GetSubgroup("type", "S_CACHE"));
+};
 
 /**
  * Test scan going in parallel with compactions.
@@ -6229,7 +6233,7 @@ Y_UNIT_TEST_SUITE(TFlatTableExecutorBTreeIndex) {
         auto &appData = env->GetAppData();
         UNIT_ASSERT_VALUES_EQUAL(appData.FeatureFlags.HasEnableLocalDBBtreeIndex(), false);
         UNIT_ASSERT_VALUES_EQUAL(appData.FeatureFlags.HasEnableLocalDBFlatIndex(), false);
-        auto counters = MakeIntrusive<TSharedPageCacheCounters>(env->GetDynamicCounters());
+        auto counters = GetSharedPageCounters(env);
         int readRows = 0, failedAttempts = 0;
 
         env.FireDummyTablet(ui32(NFake::TDummy::EFlg::Comp));
@@ -6267,7 +6271,7 @@ Y_UNIT_TEST_SUITE(TFlatTableExecutorBTreeIndex) {
 
         auto &appData = env->GetAppData();
         appData.FeatureFlags.SetEnableLocalDBBtreeIndex(true);
-        auto counters = MakeIntrusive<TSharedPageCacheCounters>(env->GetDynamicCounters());
+        auto counters = GetSharedPageCounters(env);
         int readRows = 0, failedAttempts = 0;
 
         env.FireDummyTablet(ui32(NFake::TDummy::EFlg::Comp));
@@ -6306,7 +6310,7 @@ Y_UNIT_TEST_SUITE(TFlatTableExecutorBTreeIndex) {
         auto &appData = env->GetAppData();
 
         appData.FeatureFlags.SetEnableLocalDBBtreeIndex(false);
-        auto counters = MakeIntrusive<TSharedPageCacheCounters>(env->GetDynamicCounters());
+        auto counters = GetSharedPageCounters(env);
         int readRows = 0, failedAttempts = 0;
 
         env.FireDummyTablet(ui32(NFake::TDummy::EFlg::Comp));
@@ -6345,7 +6349,7 @@ Y_UNIT_TEST_SUITE(TFlatTableExecutorBTreeIndex) {
         auto &appData = env->GetAppData();
         appData.FeatureFlags.SetEnableLocalDBBtreeIndex(true);
         appData.FeatureFlags.SetEnableLocalDBFlatIndex(false);
-        auto counters = MakeIntrusive<TSharedPageCacheCounters>(env->GetDynamicCounters());
+        auto counters = GetSharedPageCounters(env);
         int readRows = 0, failedAttempts = 0;
 
         env.FireDummyTablet(ui32(NFake::TDummy::EFlg::Comp));
@@ -6384,7 +6388,7 @@ Y_UNIT_TEST_SUITE(TFlatTableExecutorBTreeIndex) {
         auto &appData = env->GetAppData();
         appData.FeatureFlags.SetEnableLocalDBBtreeIndex(false);
         appData.FeatureFlags.SetEnableLocalDBFlatIndex(false);
-        auto counters = MakeIntrusive<TSharedPageCacheCounters>(env->GetDynamicCounters());
+        auto counters = GetSharedPageCounters(env);
         int readRows = 0, failedAttempts = 0;
 
         env.FireDummyTablet(ui32(NFake::TDummy::EFlg::Comp));
@@ -6423,7 +6427,7 @@ Y_UNIT_TEST_SUITE(TFlatTableExecutorBTreeIndex) {
         auto &appData = env->GetAppData();
         appData.FeatureFlags.SetEnableLocalDBBtreeIndex(true);
         appData.FeatureFlags.SetEnableLocalDBFlatIndex(true);
-        auto counters = MakeIntrusive<TSharedPageCacheCounters>(env->GetDynamicCounters());
+        auto counters = GetSharedPageCounters(env);
         int readRows = 0, failedAttempts = 0;
 
         env.FireDummyTablet(ui32(NFake::TDummy::EFlg::Comp));
@@ -6463,7 +6467,7 @@ Y_UNIT_TEST_SUITE(TFlatTableExecutorBTreeIndex) {
 
         auto &appData = env->GetAppData();
         appData.FeatureFlags.SetEnableLocalDBBtreeIndex(true);
-        auto counters = MakeIntrusive<TSharedPageCacheCounters>(env->GetDynamicCounters());
+        auto counters = GetSharedPageCounters(env);
         int readRows = 0, failedAttempts = 0;
 
         env.FireDummyTablet(ui32(NFake::TDummy::EFlg::Comp));

ydb/core/tablet_flat/flat_part_loader.h

@@ -85,7 +85,7 @@ namespace NTable {
             {
                 if (cookie == 0 && NeedPages.erase(loaded.PageId)) {
                     auto type = Cache->GetPageType(loaded.PageId);
-                    SavedPages[loaded.PageId] = TPinnedPageRef(loaded.Page).GetData();
+                    SavedPages[loaded.PageId] = NSharedCache::TPinnedPageRef(loaded.Page).GetData();
                     if (type != EPage::FlatIndex) {
                         // hack: saving flat index to private cache will break sticky logic
                         // keep it in shared cache only for now

ydb/core/tablet_flat/flat_sausagecache.h

@@ -9,6 +9,8 @@
 namespace NKikimr {
 namespace NTabletFlatExecutor {
 
+using namespace NSharedCache;
+
 struct TPrivatePageCachePinPad : public TAtomicRefCount<TPrivatePageCachePinPad> {
     // no internal state
 };

ydb/core/tablet_flat/shared_cache_clock_pro.h

@@ -5,7 +5,7 @@
 #include <library/cpp/monlib/counters/counters.h>
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 
-namespace NKikimr::NCache {
+namespace NKikimr::NSharedCache {
 
 // TODO: remove template args and make some page base class
 

ydb/core/tablet_flat/shared_cache_clock_pro_ut.cpp

@@ -2,7 +2,7 @@
 #include <util/random/mersenne.h>
 #include "shared_cache_clock_pro.h"
 
-namespace NKikimr::NCache {
+namespace NKikimr::NSharedCache {
 
 namespace {
 

ydb/core/tablet_flat/shared_cache_events.h

@@ -10,9 +10,7 @@
 #include <util/generic/hash.h>
 #include <util/generic/hash_set.h>
 
-namespace NKikimr {
-namespace NSharedCache {
-
+namespace NKikimr::NSharedCache {
     using EPriority = NTabletFlatExecutor::NBlockIO::EPriority;
 
     enum EEv {
@@ -129,7 +127,6 @@ namespace NSharedCache {
         THashMap<TLogoBlobID, TActions> Actions;
     };
 }
-}
 
 template<> inline
 void Out<NKikimr::NTabletFlatExecutor::NBlockIO::EPriority>(

ydb/core/tablet_flat/shared_cache_s3fifo.h

@@ -5,7 +5,7 @@
 #include <library/cpp/monlib/counters/counters.h>
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 
-namespace NKikimr::NCache {
+namespace NKikimr::NSharedCache {
 
 // TODO: remove template args and make some page base class
 

ydb/core/tablet_flat/shared_cache_s3fifo_ut.cpp

@@ -2,7 +2,7 @@
 #include <library/cpp/resource/resource.h>
 #include "shared_cache_s3fifo.h"
 
-namespace NKikimr::NCache {
+namespace NKikimr::NSharedCache {
 
 namespace {
 

ydb/core/tablet_flat/shared_cache_switchable.h

@@ -4,7 +4,7 @@
 #include <library/cpp/monlib/counters/counters.h>
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 
-namespace NKikimr::NCache {
+namespace NKikimr::NSharedCache {
 
 template <typename TPage, typename TPageTraits>
 class TSwitchableCache : public ICacheCache<TPage> {

ydb/core/tablet_flat/shared_cache_switchable_ut.cpp

@@ -2,7 +2,7 @@
 #include <ydb/core/tablet_flat/shared_cache_switchable.h>
 #include <ydb/core/util/cache_cache_iface.h>
 
-namespace NKikimr::NCache {
+namespace NKikimr::NSharedCache {
 
 namespace {