diff options
author | Alexander Rutkovsky <alexvru@mail.ru> | 2022-02-10 16:47:39 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:39 +0300 |
commit | f3646f91e0de459836a7800b9ce3e8dc57a2ab3a (patch) | |
tree | 25c1423200152570c1f8307e5b8304b9bc3840c5 /library/cpp/actors/testlib | |
parent | fccc62e9bfdce9be2fe7e0f23479da3a5512211a (diff) | |
download | ydb-f3646f91e0de459836a7800b9ce3e8dc57a2ab3a.tar.gz |
Restoring authorship annotation for Alexander Rutkovsky <alexvru@mail.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/actors/testlib')
-rw-r--r-- | library/cpp/actors/testlib/test_runtime.cpp | 46 | ||||
-rw-r--r-- | library/cpp/actors/testlib/test_runtime.h | 14 | ||||
-rw-r--r-- | library/cpp/actors/testlib/ya.make | 2 |
3 files changed, 31 insertions, 31 deletions
diff --git a/library/cpp/actors/testlib/test_runtime.cpp b/library/cpp/actors/testlib/test_runtime.cpp index 6fa25b9965..db9d20b7ac 100644 --- a/library/cpp/actors/testlib/test_runtime.cpp +++ b/library/cpp/actors/testlib/test_runtime.cpp @@ -11,7 +11,7 @@ #include <library/cpp/random_provider/random_provider.h> #include <library/cpp/actors/interconnect/interconnect.h> #include <library/cpp/actors/interconnect/interconnect_tcp_proxy.h> -#include <library/cpp/actors/interconnect/interconnect_proxy_wrapper.h> +#include <library/cpp/actors/interconnect/interconnect_proxy_wrapper.h> #include <util/generic/maybe.h> #include <util/generic/bt_exception.h> @@ -487,9 +487,9 @@ namespace NActors { void TTestActorRuntimeBase::InitNode(TNodeDataBase* node, size_t nodeIndex) { const NActors::TActorId loggerActorId = NActors::TActorId(FirstNodeId + nodeIndex, "logger"); - node->LogSettings = new NActors::NLog::TSettings(loggerActorId, 410 /* NKikimrServices::LOGGER */, + node->LogSettings = new NActors::NLog::TSettings(loggerActorId, 410 /* NKikimrServices::LOGGER */, NActors::NLog::PRI_WARN, NActors::NLog::PRI_WARN, 0); - node->LogSettings->SetAllowDrop(false); + node->LogSettings->SetAllowDrop(false); node->LogSettings->SetThrottleDelay(TDuration::Zero()); node->DynamicCounters = new NMonitoring::TDynamicCounters; @@ -642,8 +642,8 @@ namespace NActors { while (!scheduledEvents.empty() && scheduledEvents.begin()->Deadline == time) { static THashMap<std::pair<TActorId, TString>, ui64> eventTypes; auto& item = *scheduledEvents.begin(); - TString name = item.Event->GetBase() ? TypeName(*item.Event->GetBase()) : Sprintf("%08" PRIx32, item.Event->Type); - eventTypes[std::make_pair(item.Event->Recipient, name)]++; + TString name = item.Event->GetBase() ? TypeName(*item.Event->GetBase()) : Sprintf("%08" PRIx32, item.Event->Type); + eventTypes[std::make_pair(item.Event->Recipient, name)]++; runtime.ScheduledCount++; if (runtime.ScheduledCount > runtime.ScheduledLimit) { // TScheduledTreeItem root("Root"); @@ -1653,11 +1653,11 @@ namespace NActors { common->TechnicalSelfHostName = "::1"; if (!UseRealThreads) { - common->Settings.DeadPeer = TDuration::Max(); - common->Settings.CloseOnIdle = TDuration::Max(); - common->Settings.PingPeriod = TDuration::Max(); - common->Settings.ForceConfirmPeriod = TDuration::Max(); - common->Settings.Handshake = TDuration::Max(); + common->Settings.DeadPeer = TDuration::Max(); + common->Settings.CloseOnIdle = TDuration::Max(); + common->Settings.PingPeriod = TDuration::Max(); + common->Settings.ForceConfirmPeriod = TDuration::Max(); + common->Settings.Handshake = TDuration::Max(); } common->ClusterUUID = ClusterUUID; @@ -1667,22 +1667,22 @@ namespace NActors { if (proxyNodeIndex == nodeIndex) continue; - const ui32 peerNodeId = FirstNodeId + proxyNodeIndex; + const ui32 peerNodeId = FirstNodeId + proxyNodeIndex; - IActor *proxyActor = UseRealInterconnect - ? new TInterconnectProxyTCP(peerNodeId, common) - : InterconnectMock.CreateProxyMock(setup->NodeId, peerNodeId, common); - - setup->Interconnect.ProxyActors[peerNodeId] = {proxyActor, TMailboxType::ReadAsFilled, InterconnectPoolId()}; + IActor *proxyActor = UseRealInterconnect + ? new TInterconnectProxyTCP(peerNodeId, common) + : InterconnectMock.CreateProxyMock(setup->NodeId, peerNodeId, common); + + setup->Interconnect.ProxyActors[peerNodeId] = {proxyActor, TMailboxType::ReadAsFilled, InterconnectPoolId()}; } - setup->Interconnect.ProxyWrapperFactory = CreateProxyWrapperFactory(common, InterconnectPoolId(), &InterconnectMock); - - if (UseRealInterconnect) { - setup->LocalServices.emplace_back(MakePollerActorId(), NActors::TActorSetupCmd(CreatePollerActor(), - NActors::TMailboxType::Simple, InterconnectPoolId())); - } + setup->Interconnect.ProxyWrapperFactory = CreateProxyWrapperFactory(common, InterconnectPoolId(), &InterconnectMock); + if (UseRealInterconnect) { + setup->LocalServices.emplace_back(MakePollerActorId(), NActors::TActorSetupCmd(CreatePollerActor(), + NActors::TMailboxType::Simple, InterconnectPoolId())); + } + if (!SingleSysEnv) { // Single system env should do this self TAutoPtr<TLogBackend> logBackend = LogBackend ? LogBackend : NActors::CreateStderrBackend(); NActors::TLoggerActor *loggerActor = new NActors::TLoggerActor(node->LogSettings, @@ -1852,7 +1852,7 @@ namespace NActors { ReplyChecker->OnRequest(ev); TAutoPtr<IEventHandle> forwardedEv = ev->HasEvent() ? new IEventHandle(Delegatee, ReplyId, ev->ReleaseBase().Release(), ev->Flags, ev->Cookie) - : new IEventHandle(ev->GetTypeRewrite(), ev->Flags, Delegatee, ReplyId, ev->ReleaseChainBuffer(), ev->Cookie); + : new IEventHandle(ev->GetTypeRewrite(), ev->Flags, Delegatee, ReplyId, ev->ReleaseChainBuffer(), ev->Cookie); return forwardedEv; } diff --git a/library/cpp/actors/testlib/test_runtime.h b/library/cpp/actors/testlib/test_runtime.h index 26e3b45c98..ebf445f8a5 100644 --- a/library/cpp/actors/testlib/test_runtime.h +++ b/library/cpp/actors/testlib/test_runtime.h @@ -8,7 +8,7 @@ #include <library/cpp/actors/core/mailbox.h> #include <library/cpp/actors/util/should_continue.h> #include <library/cpp/actors/interconnect/poller_tcp.h> -#include <library/cpp/actors/interconnect/mock/ic_mock.h> +#include <library/cpp/actors/interconnect/mock/ic_mock.h> #include <library/cpp/random_provider/random_provider.h> #include <library/cpp/time_provider/time_provider.h> #include <library/cpp/testing/unittest/tests_data.h> @@ -467,10 +467,10 @@ namespace NActors { const TVector<ui64>& GetTxAllocatorTabletIds() const { return TxAllocatorTabletIds; } void SetTxAllocatorTabletIds(const TVector<ui64>& ids) { TxAllocatorTabletIds = ids; } - void SetUseRealInterconnect() { - UseRealInterconnect = true; - } - + void SetUseRealInterconnect() { + UseRealInterconnect = true; + } + protected: struct TNodeDataBase; TNodeDataBase* GetRawNode(ui32 node) const { @@ -508,8 +508,8 @@ namespace NActors { const TThread::TId MainThreadId; protected: - bool UseRealInterconnect = false; - TInterconnectMock InterconnectMock; + bool UseRealInterconnect = false; + TInterconnectMock InterconnectMock; bool IsInitialized = false; bool SingleSysEnv = false; const TString ClusterUUID; diff --git a/library/cpp/actors/testlib/ya.make b/library/cpp/actors/testlib/ya.make index 1afb3f6059..c42f9306d7 100644 --- a/library/cpp/actors/testlib/ya.make +++ b/library/cpp/actors/testlib/ya.make @@ -10,7 +10,7 @@ SRCS( PEERDIR( library/cpp/actors/core - library/cpp/actors/interconnect/mock + library/cpp/actors/interconnect/mock library/cpp/actors/protos library/cpp/random_provider library/cpp/time_provider |