Skip to content

Commit

Permalink
Merge 8dfb7ce into ae7b009
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexvru
alexvru authored Mar 1, 2024
2 parents ae7b009 + 8dfb7ce commit e50382d
Show file tree
Hide file tree
Showing 192 changed files with 1,098 additions and 2,008 deletions.
24 changes: 11 additions & 13 deletions ydb/core/base/board_lookup.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
const TString Path;
const TActorId Owner;
const EBoardLookupMode Mode;
const ui32 StateStorageGroupId;
const bool Subscriber;
TBoardRetrySettings BoardRetrySettings;

Expand Down Expand Up @@ -112,11 +111,11 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
void NotAvailable() {
if (CurrentStateFunc() != &TThis::StateSubscribe) {
Send(Owner, new TEvStateStorage::TEvBoardInfo(
TEvStateStorage::TEvBoardInfo::EStatus::NotAvailable, Path, StateStorageGroupId));
TEvStateStorage::TEvBoardInfo::EStatus::NotAvailable, Path));
} else {
Send(Owner,
new TEvStateStorage::TEvBoardInfoUpdate(
TEvStateStorage::TEvBoardInfo::EStatus::NotAvailable, Path, StateStorageGroupId
TEvStateStorage::TEvBoardInfo::EStatus::NotAvailable, Path
)
);
}
Expand All @@ -128,7 +127,7 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
if ((!Subscriber && Stats.HasInfo == WaitForReplicasToSuccess) ||
(Subscriber && Stats.HasInfo + Stats.NoInfo == WaitForReplicasToSuccess)) {
auto reply = MakeHolder<TEvStateStorage::TEvBoardInfo>(
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path, StateStorageGroupId);
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path);
reply->InfoEntries = std::move(Info);
Send(Owner, std::move(reply));
if (Subscriber) {
Expand Down Expand Up @@ -158,7 +157,7 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
auto *msg = ev->Get();

if (msg->Replicas.empty()) {
BLOG_ERROR("lookup on unconfigured statestorage board service " << StateStorageGroupId);
BLOG_ERROR("lookup on unconfigured statestorage board service");
return NotAvailable();
}

Expand Down Expand Up @@ -239,7 +238,7 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
}
if (update.has_value()) {
auto reply = MakeHolder<TEvStateStorage::TEvBoardInfoUpdate>(
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path, StateStorageGroupId);
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path);
reply->Updates = { { oid, std::move(update.value()) } };
Send(Owner, std::move(reply));
}
Expand Down Expand Up @@ -307,7 +306,7 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {

if (isStateSubscribe && !updates.empty()) {
auto reply = MakeHolder<TEvStateStorage::TEvBoardInfoUpdate>(
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path, StateStorageGroupId);
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path);
reply->Updates = std::move(updates);
Send(Owner, std::move(reply));
}
Expand Down Expand Up @@ -483,7 +482,7 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
}
if (isStateSubscribe && !updates.empty()) {
auto reply = MakeHolder<TEvStateStorage::TEvBoardInfoUpdate>(
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path, StateStorageGroupId);
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path);
reply->Updates = std::move(updates);
Send(Owner, std::move(reply));
}
Expand All @@ -495,19 +494,18 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
}

TBoardLookupActor(
const TString &path, TActorId owner, EBoardLookupMode mode, ui32 groupId,
const TString &path, TActorId owner, EBoardLookupMode mode,
TBoardRetrySettings boardRetrySettings)
: Path(path)
, Owner(owner)
, Mode(mode)
, StateStorageGroupId(groupId)
, Subscriber(Mode == EBoardLookupMode::Subscription)
, BoardRetrySettings(std::move(boardRetrySettings))
, WaitForReplicasToSuccess(0)
{}

void Bootstrap() {
const TActorId proxyId = MakeStateStorageProxyID(StateStorageGroupId);
const TActorId proxyId = MakeStateStorageProxyID();
Send(proxyId, new TEvStateStorage::TEvResolveBoard(Path), IEventHandle::FlagTrackDelivery);
Become(&TThis::StateResolve);
}
Expand Down Expand Up @@ -546,9 +544,9 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
};

IActor* CreateBoardLookupActor(
const TString &path, const TActorId &owner, ui32 groupId, EBoardLookupMode mode,
const TString &path, const TActorId &owner, EBoardLookupMode mode,
TBoardRetrySettings boardRetrySettings) {
return new TBoardLookupActor(path, owner, mode, groupId, std::move(boardRetrySettings));
return new TBoardLookupActor(path, owner, mode, std::move(boardRetrySettings));
}

}
14 changes: 6 additions & 8 deletions ydb/core/base/board_publish.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ class TBoardPublishActor : public TActorBootstrapped<TBoardPublishActor> {
const TString Path;
const TString Payload;
const TActorId Owner;
const ui32 StateStorageGroupId;
const ui32 TtlMs;
const bool Register;
const TBoardRetrySettings BoardRetrySettings;
Expand Down Expand Up @@ -143,15 +142,15 @@ class TBoardPublishActor : public TActorBootstrapped<TBoardPublishActor> {
}

void HandleUndelivered() {
BLOG_ERROR("publish on unavailable statestorage board service " << StateStorageGroupId);
BLOG_ERROR("publish on unavailable statestorage board service");
Become(&TThis::StateCalm);
}

void Handle(TEvStateStorage::TEvResolveReplicasList::TPtr &ev) {
auto *msg = ev->Get();

if (msg->Replicas.empty()) {
BLOG_ERROR("publish on unconfigured statestorage board service " << StateStorageGroupId);
BLOG_ERROR("publish on unconfigured statestorage board service");
} else {
auto now = TlsActivationContext->Monotonic();
for (auto &replicaId : msg->Replicas) {
Expand Down Expand Up @@ -238,12 +237,11 @@ class TBoardPublishActor : public TActorBootstrapped<TBoardPublishActor> {
}

TBoardPublishActor(
const TString &path, const TString &payload, const TActorId &owner, ui32 groupId, ui32 ttlMs, bool reg,
const TString &path, const TString &payload, const TActorId &owner, ui32 ttlMs, bool reg,
TBoardRetrySettings boardRetrySettings)
: Path(path)
, Payload(payload)
, Owner(owner)
, StateStorageGroupId(groupId)
, TtlMs(ttlMs)
, Register(reg)
, BoardRetrySettings(std::move(boardRetrySettings))
Expand All @@ -253,7 +251,7 @@ class TBoardPublishActor : public TActorBootstrapped<TBoardPublishActor> {
}

void Bootstrap() {
const TActorId proxyId = MakeStateStorageProxyID(StateStorageGroupId);
const TActorId proxyId = MakeStateStorageProxyID();
Send(proxyId, new TEvStateStorage::TEvResolveBoard(Path), IEventHandle::FlagTrackDelivery);

Become(&TThis::StateResolve);
Expand All @@ -277,9 +275,9 @@ class TBoardPublishActor : public TActorBootstrapped<TBoardPublishActor> {
};

IActor* CreateBoardPublishActor(
const TString &path, const TString &payload, const TActorId &owner, ui32 groupId, ui32 ttlMs, bool reg,
const TString &path, const TString &payload, const TActorId &owner, ui32 ttlMs, bool reg,
TBoardRetrySettings boardRetrySettings) {
return new TBoardPublishActor(path, payload, owner, groupId, ttlMs, reg, std::move(boardRetrySettings));
return new TBoardPublishActor(path, payload, owner, ttlMs, reg, std::move(boardRetrySettings));
}

TString MakeEndpointsBoardPath(const TString &database) {
Expand Down
8 changes: 4 additions & 4 deletions ydb/core/base/board_subscriber_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class TBoardSubscriberTest: public NUnitTest::TTestBase {

TActorId CreateSubscriber(const TString& path, const TActorId& owner, ui32 nodeIdx) {
const TActorId subscriber = Context->Register(
CreateBoardLookupActor(path, owner, 0, EBoardLookupMode::Subscription), nodeIdx
CreateBoardLookupActor(path, owner, EBoardLookupMode::Subscription), nodeIdx
);
Context->EnableScheduleForActor(subscriber);
return subscriber;
Expand All @@ -30,7 +30,7 @@ class TBoardSubscriberTest: public NUnitTest::TTestBase {
TActorId CreatePublisher(
const TString& path, const TString& payload, const TActorId& owner, ui32 nodeIdx) {
const TActorId publisher = Context->Register(
CreateBoardPublishActor(path, payload, owner, 0, 0, true), nodeIdx
CreateBoardPublishActor(path, payload, owner, 0, true), nodeIdx
);
Context->EnableScheduleForActor(publisher);
return publisher;
Expand Down Expand Up @@ -61,7 +61,7 @@ class TBoardSubscriberTest: public NUnitTest::TTestBase {
}

TVector<TActorId> ResolveReplicas() {
const TActorId proxy = MakeStateStorageProxyID(0);
const TActorId proxy = MakeStateStorageProxyID();
const TActorId edge = Context->AllocateEdgeActor();

Context->Send(proxy, edge, new TEvStateStorage::TEvResolveBoard("path"));
Expand All @@ -76,7 +76,7 @@ class TBoardSubscriberTest: public NUnitTest::TTestBase {
void SetUp() override {
Context = MakeHolder<TTestBasicRuntime>(3);

SetupCustomStateStorage(*Context, 3, 3, 1, 0);
SetupCustomStateStorage(*Context, 3, 3, 1);

Context->Initialize(TAppPrepare().Unwrap());
}
Expand Down
8 changes: 0 additions & 8 deletions ydb/core/base/domain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,14 @@
namespace NKikimr {

TDomainsInfo::TDomain::TDomain(const TString &name, ui32 domainUid, ui64 schemeRootId,
ui32 defaultStateStorageGroup, ui32 defaultSchemeBoardGroup,
TVectorUi32 stateStorageGroup,
TVectorUi64 coordinators, TVectorUi64 mediators, TVectorUi64 allocators,
ui32 defaultHiveUid, TVectorUi32 hivesUids,
ui64 domainPlanResolution, const TStoragePoolKinds *poolTypes)
: DomainUid(domainUid)
, DefaultStateStorageGroup(defaultStateStorageGroup)
, DefaultSchemeBoardGroup(defaultSchemeBoardGroup)
, SchemeRoot(schemeRootId)
, Name(name)
, Coordinators(std::move(coordinators))
, Mediators(std::move(mediators))
, TxAllocators(std::move(allocators))
, StateStorageGroups(std::move(stateStorageGroup))
, DefaultHiveUid(defaultHiveUid)
, HiveUids(std::move(hivesUids))
, DomainPlanResolution(domainPlanResolution)
, StoragePoolTypes(poolTypes ? *poolTypes : TStoragePoolKinds())
{}
Expand Down
Loading

0 comments on commit e50382d

Please sign in to comment.