Shared Cache owner is sender (#15891)

Author: kunga

ydb/core/tablet_flat/flat_executor.cpp

@@ -691,7 +691,7 @@ void TExecutor::AddCachesOfBundle(const NTable::TPartView &partView)
 void TExecutor::AddSingleCache(const TIntrusivePtr<TPrivatePageCache::TInfo> &info)
 {
     PrivatePageCache->RegisterPageCollection(info);
-    Send(MakeSharedPageCacheId(), new NSharedCache::TEvAttach(info->PageCollection, SelfId()));
+    Send(MakeSharedPageCacheId(), new NSharedCache::TEvAttach(info->PageCollection));
 
     StickyPagesMemory += info->GetStickySize();
 
@@ -1179,8 +1179,7 @@ void TExecutor::RequestFromSharedCache(TAutoPtr<NPageCollection::TFetch> fetch,
 
     Send(MakeSharedPageCacheId(), new NSharedCache::TEvRequest(
         priority,
-        fetch,
-        SelfId()),
+        fetch),
         0, (ui64)requestCategory);
 }
 

ydb/core/tablet_flat/flat_executor_bootlogic.cpp

@@ -184,8 +184,7 @@ NBoot::TSpawned TExecutorBootLogic::LoadPages(NBoot::IStep *step, TAutoPtr<NPage
         NSharedCache::MakeSharedPageCacheId(),
         new NSharedCache::TEvRequest(
             NBlockIO::EPriority::Fast,
-            req,
-            SelfId),
+            req),
         0, (ui64)EPageCollectionRequest::BootLogic);
 
     return NBoot::TSpawned(true);

ydb/core/tablet_flat/flat_scan_actor.h

@@ -82,7 +82,6 @@ namespace NOps {
             enum EEv {
                 EvLoadBlob = EventSpaceBegin(TKikimrEvents::ES_PRIVATE),
                 EvBlobLoaded,
-                EvLoadPages,
                 EvPartLoaded,
                 EvPartFailed,
             };
@@ -107,14 +106,6 @@ namespace NOps {
                 { }
             };
 
-            struct TEvLoadPages : public TEventLocal<TEvLoadPages, EvLoadPages> {
-                TAutoPtr<NPageCollection::TFetch> Request;
-
-                TEvLoadPages(TAutoPtr<NPageCollection::TFetch> request)
-                    : Request(std::move(request))
-                { }
-            };
-
             struct TEvPartLoaded : public TEventLocal<TEvPartLoaded, EvPartLoaded> {
                 TPartView Part;
 
@@ -135,9 +126,10 @@ namespace NOps {
     private:
         class TColdPartLoader : public ::NActors::TActorBootstrapped<TColdPartLoader> {
         public:
-            TColdPartLoader(TActorId owner, TIntrusiveConstPtr<TColdPartStore> part)
+            TColdPartLoader(TActorId owner, TIntrusiveConstPtr<TColdPartStore> part, EPriority readPriority)
                 : Owner(owner)
                 , Part(std::move(part))
+                , ReadPriority(readPriority)
             { }
 
             void Bootstrap() {
@@ -195,7 +187,7 @@ namespace NOps {
 
             void RunLoader() {
                 for (auto req : Loader->Run({.PreloadIndex = false, .PreloadData = false})) {
-                    Send(Owner, new TEvPrivate::TEvLoadPages(std::move(req)));
+                    Send(MakeSharedPageCacheId(), new NSharedCache::TEvRequest(ReadPriority, req));
                     ++ReadsLeft;
                 }
 
@@ -209,6 +201,7 @@ namespace NOps {
             STRICT_STFUNC(StateLoadPart, {
                 sFunc(TEvents::TEvPoison, PassAway);
                 hFunc(NSharedCache::TEvResult, Handle);
+                hFunc(NBlockIO::TEvStat, Handle);
             });
 
             void Handle(NSharedCache::TEvResult::TPtr& ev) {
@@ -229,9 +222,20 @@ namespace NOps {
                 }
             }
 
+            void Handle(NBlockIO::TEvStat::TPtr& ev) {
+                ev->Rewrite(ev->GetTypeRewrite(), Owner);
+                TActivationContext::Send(ev.Release());
+            }
+
+            void PassAway() override {
+                Send(MakeSharedPageCacheId(), new NSharedCache::TEvUnregister);
+                TActorBootstrapped::PassAway();
+            }
+
         private:
             TActorId Owner;
             TIntrusiveConstPtr<TColdPartStore> Part;
+            EPriority ReadPriority;
             TVector<TIntrusivePtr<TPrivatePageCache::TInfo>> PageCollections;
             TVector<NPageCollection::TLargeGlobIdRestoreState> PageCollectionLoaders;
             size_t PageCollectionsLeft = 0;
@@ -306,7 +310,7 @@ namespace NOps {
                 // Create a loader for this new part
                 TIntrusiveConstPtr<TColdPartStore> partStore = dynamic_cast<TColdPartStore*>(const_cast<TColdPart*>(part.Get()));
                 Y_VERIFY_S(partStore, "Cannot load unsupported part " << NFmt::Do(*part));
-                ColdPartLoaders[label] = RegisterWithSameMailbox(new TColdPartLoader(SelfId(), std::move(partStore)));
+                ColdPartLoaders[label] = RegisterWithSameMailbox(new TColdPartLoader(SelfId(), std::move(partStore), Args.ReadPrio));
             }
 
             // Return empty TPartView to signal loader is still in progress
@@ -359,7 +363,6 @@ namespace NOps {
             hFunc(TEvContinue, Handle);
             hFunc(TEvPrivate::TEvLoadBlob, Handle);
             hFunc(TEvBlobStorage::TEvGetResult, Handle);
-            hFunc(TEvPrivate::TEvLoadPages, Handle);
             hFunc(NBlockIO::TEvStat, Handle);
             hFunc(TEvPrivate::TEvPartLoaded, Handle);
             hFunc(TEvPrivate::TEvPartFailed, Handle);
@@ -484,7 +487,7 @@ namespace NOps {
                     if (auto logl = Logger->Log(ELnLev::Debug))
                         logl << NFmt::Do(*this) << " " << NFmt::Do(*req);
 
-                    Send(MakeSharedPageCacheId(), new NSharedCache::TEvRequest(Args.ReadPrio, req, SelfId()));
+                    Send(MakeSharedPageCacheId(), new NSharedCache::TEvRequest(Args.ReadPrio, req));
                 }
 
                 if (ready == NTable::EReady::Page)
@@ -560,16 +563,6 @@ namespace NOps {
             }
         }
 
-        void Handle(TEvPrivate::TEvLoadPages::TPtr& ev)
-        {
-            auto* msg = ev->Get();
-
-            TActorIdentity(ev->Sender).Send(
-                MakeSharedPageCacheId(),
-                new NSharedCache::TEvRequest(Args.ReadPrio, std::move(msg->Request), SelfId()),
-                ev->Flags, ev->Cookie);
-        }
-
         void Handle(NBlockIO::TEvStat::TPtr& ev)
         {
             ev->Rewrite(ev->GetTypeRewrite(), Owner);

ydb/core/tablet_flat/shared_cache_events.h

@@ -55,13 +55,10 @@ namespace NKikimr::NSharedCache {
 
     struct TEvAttach : public TEventLocal<TEvAttach, EvAttach> {
         TIntrusiveConstPtr<NPageCollection::IPageCollection> PageCollection;
-        TActorId Owner;
 
-        TEvAttach(TIntrusiveConstPtr<NPageCollection::IPageCollection> pageCollection, TActorId owner)
+        TEvAttach(TIntrusiveConstPtr<NPageCollection::IPageCollection> pageCollection)
             : PageCollection(std::move(pageCollection))
-            , Owner(owner)
         {
-            Y_ABORT_UNLESS(Owner, "Cannot send request with empty owner");
         }
     };
 
@@ -81,14 +78,11 @@ namespace NKikimr::NSharedCache {
     struct TEvRequest : public TEventLocal<TEvRequest, EvRequest> {
         const EPriority Priority;
         TAutoPtr<NPageCollection::TFetch> Fetch;
-        TActorId Owner;
 
-        TEvRequest(EPriority priority, TAutoPtr<NPageCollection::TFetch> fetch, TActorId owner)
+        TEvRequest(EPriority priority, TAutoPtr<NPageCollection::TFetch> fetch)
             : Priority(priority)
             , Fetch(fetch)
-            , Owner(owner)
         {
-            Y_ABORT_UNLESS(Owner, "Cannot sent request with empty owner");
         }
     };