-
Notifications
You must be signed in to change notification settings - Fork 567
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
30 changed files
with
243 additions
and
313 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,88 +1,88 @@ | ||
| #include "shared_cache_configurator.h" | ||
| #include "configs_dispatcher.h" | ||
| #include "console.h" | ||
|
|
||
| #include <ydb/core/base/appdata.h> | ||
| #include <ydb/core/tablet_flat/shared_sausagecache.h> | ||
|
|
||
| #include <ydb/library/actors/core/actor_bootstrapped.h> | ||
|
|
||
| #include <ydb/core/protos/bootstrap.pb.h> | ||
|
|
||
| namespace NKikimr::NConsole { | ||
|
|
||
| class TSharedCacheConfigurator : public TActorBootstrapped<TSharedCacheConfigurator> { | ||
| public: | ||
| static constexpr NKikimrServices::TActivity::EType ActorActivityType() { | ||
| return NKikimrServices::TActivity::SHARED_CACHE_CONFIGURATOR; | ||
| } | ||
|
|
||
| TSharedCacheConfigurator() = default; | ||
|
|
||
| void Bootstrap(const TActorContext& ctx) { | ||
| LOG_DEBUG_S(ctx, NKikimrServices::CMS_CONFIGS, "TSharedCacheConfigurator Bootstrap"); | ||
|
|
||
| ui32 item1 = (ui32)NKikimrConsole::TConfigItem::BootstrapConfigItem; | ||
| ui32 item2 = (ui32)NKikimrConsole::TConfigItem::SharedCacheConfigItem; | ||
| ctx.Send(MakeConfigsDispatcherID(SelfId().NodeId()), | ||
| new TEvConfigsDispatcher::TEvSetConfigSubscriptionRequest({ item1, item2 })); | ||
| Become(&TThis::StateWork); | ||
| } | ||
|
|
||
| void Handle(TEvConsole::TEvConfigNotificationRequest::TPtr& ev, const TActorContext& ctx) { | ||
| const auto& record = ev->Get()->Record; | ||
|
|
||
| LOG_INFO_S(ctx, NKikimrServices::CMS_CONFIGS, | ||
| "TSharedCacheConfigurator: got new config: " << record.GetConfig().ShortDebugString()); | ||
|
|
||
| auto* appData = AppData(ctx); | ||
|
|
||
| NKikimrSharedCache::TSharedCacheConfig cfg; | ||
| if (record.GetConfig().HasBootstrapConfig()) { | ||
| if (record.GetConfig().GetBootstrapConfig().HasSharedCacheConfig()) { | ||
| cfg.MergeFrom(record.GetConfig().GetBootstrapConfig().GetSharedCacheConfig()); | ||
| } | ||
| } else if (appData->BootstrapConfig.HasSharedCacheConfig()) { | ||
| cfg.MergeFrom(appData->BootstrapConfig.GetSharedCacheConfig()); | ||
| } | ||
| if (record.GetConfig().HasSharedCacheConfig()) { | ||
| cfg.MergeFrom(record.GetConfig().GetSharedCacheConfig()); | ||
| } else { | ||
| cfg.MergeFrom(appData->SharedCacheConfig); | ||
| } | ||
|
|
||
| ApplyConfig(std::move(cfg), ctx); | ||
|
|
||
| auto response = MakeHolder<TEvConsole::TEvConfigNotificationResponse>(record); | ||
| ctx.Send(ev->Sender, response.Release(), 0, ev->Cookie); | ||
| } | ||
|
|
||
| void ApplyConfig(NKikimrSharedCache::TSharedCacheConfig&& cfg, const TActorContext& ctx) { | ||
| auto event = MakeHolder<TEvSharedPageCache::TEvConfigure>(); | ||
| event->Record.Swap(&cfg); | ||
|
|
||
| LOG_DEBUG_S(ctx, NKikimrServices::CMS_CONFIGS, | ||
| "Applying new shared cache config: " << event->Record.ShortDebugString()); | ||
|
|
||
| ctx.Send(MakeSharedPageCacheId(0), event.Release()); | ||
| } | ||
|
|
||
| STFUNC(StateWork) { | ||
| switch (ev->GetTypeRewrite()) { | ||
| HFunc(TEvConsole::TEvConfigNotificationRequest, Handle); | ||
| IgnoreFunc(TEvConfigsDispatcher::TEvSetConfigSubscriptionResponse); | ||
|
|
||
| default: | ||
| Y_ABORT("unexpected event type: %" PRIx32 " event: %s", | ||
| ev->GetTypeRewrite(), ev->ToString().data()); | ||
| break; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| IActor *CreateSharedCacheConfigurator() | ||
| { | ||
| return new TSharedCacheConfigurator(); | ||
| } | ||
|
|
||
| } // namespace NKikimr::NConsole | ||
| // #include "shared_cache_configurator.h" | ||
| // #include "configs_dispatcher.h" | ||
| // #include "console.h" | ||
|
|
||
| // #include <ydb/core/base/appdata.h> | ||
| // #include <ydb/core/tablet_flat/shared_sausagecache.h> | ||
|
|
||
| // #include <ydb/library/actors/core/actor_bootstrapped.h> | ||
|
|
||
| // #include <ydb/core/protos/bootstrap.pb.h> | ||
|
|
||
| // namespace NKikimr::NConsole { | ||
|
|
||
| // class TSharedCacheConfigurator : public TActorBootstrapped<TSharedCacheConfigurator> { | ||
| // public: | ||
| // static constexpr NKikimrServices::TActivity::EType ActorActivityType() { | ||
| // return NKikimrServices::TActivity::SHARED_CACHE_CONFIGURATOR; | ||
| // } | ||
|
|
||
| // TSharedCacheConfigurator() = default; | ||
|
|
||
| // void Bootstrap(const TActorContext& ctx) { | ||
| // LOG_DEBUG_S(ctx, NKikimrServices::CMS_CONFIGS, "TSharedCacheConfigurator Bootstrap"); | ||
|
|
||
| // ui32 item1 = (ui32)NKikimrConsole::TConfigItem::BootstrapConfigItem; | ||
| // ui32 item2 = (ui32)NKikimrConsole::TConfigItem::SharedCacheConfigItem; | ||
| // ctx.Send(MakeConfigsDispatcherID(SelfId().NodeId()), | ||
| // new TEvConfigsDispatcher::TEvSetConfigSubscriptionRequest({ item1, item2 })); | ||
| // Become(&TThis::StateWork); | ||
| // } | ||
|
|
||
| // void Handle(TEvConsole::TEvConfigNotificationRequest::TPtr& ev, const TActorContext& ctx) { | ||
| // const auto& record = ev->Get()->Record; | ||
|
|
||
| // LOG_INFO_S(ctx, NKikimrServices::CMS_CONFIGS, | ||
| // "TSharedCacheConfigurator: got new config: " << record.GetConfig().ShortDebugString()); | ||
|
|
||
| // auto* appData = AppData(ctx); | ||
|
|
||
| // NKikimrSharedCache::TSharedCacheConfig cfg; | ||
| // if (record.GetConfig().HasBootstrapConfig()) { | ||
| // if (record.GetConfig().GetBootstrapConfig().HasSharedCacheConfig()) { | ||
| // cfg.MergeFrom(record.GetConfig().GetBootstrapConfig().GetSharedCacheConfig()); | ||
| // } | ||
| // } else if (appData->BootstrapConfig.HasSharedCacheConfig()) { | ||
| // cfg.MergeFrom(appData->BootstrapConfig.GetSharedCacheConfig()); | ||
| // } | ||
| // if (record.GetConfig().HasSharedCacheConfig()) { | ||
| // cfg.MergeFrom(record.GetConfig().GetSharedCacheConfig()); | ||
| // } else { | ||
| // cfg.MergeFrom(appData->SharedCacheConfig); | ||
| // } | ||
|
|
||
| // ApplyConfig(std::move(cfg), ctx); | ||
|
|
||
| // auto response = MakeHolder<TEvConsole::TEvConfigNotificationResponse>(record); | ||
| // ctx.Send(ev->Sender, response.Release(), 0, ev->Cookie); | ||
| // } | ||
|
|
||
| // void ApplyConfig(NKikimrSharedCache::TSharedCacheConfig&& cfg, const TActorContext& ctx) { | ||
| // auto event = MakeHolder<TEvSharedPageCache::TEvConfigure>(); | ||
| // event->Record.Swap(&cfg); | ||
|
|
||
| // LOG_DEBUG_S(ctx, NKikimrServices::CMS_CONFIGS, | ||
| // "Applying new shared cache config: " << event->Record.ShortDebugString()); | ||
|
|
||
| // ctx.Send(MakeSharedPageCacheId(0), event.Release()); | ||
| // } | ||
|
|
||
| // STFUNC(StateWork) { | ||
| // switch (ev->GetTypeRewrite()) { | ||
| // HFunc(TEvConsole::TEvConfigNotificationRequest, Handle); | ||
| // IgnoreFunc(TEvConfigsDispatcher::TEvSetConfigSubscriptionResponse); | ||
|
|
||
| // default: | ||
| // Y_ABORT("unexpected event type: %" PRIx32 " event: %s", | ||
| // ev->GetTypeRewrite(), ev->ToString().data()); | ||
| // break; | ||
| // } | ||
| // } | ||
| // }; | ||
|
|
||
| // IActor *CreateSharedCacheConfigurator() | ||
| // { | ||
| // return new TSharedCacheConfigurator(); | ||
| // } | ||
|
|
||
| // } // namespace NKikimr::NConsole |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ | |
|
|
||
| #include <atomic> | ||
|
|
||
| namespace NKikimr { | ||
| namespace NKikimr::NSharedCache { | ||
|
|
||
| class TSharedPageGCList; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.