From 4616d9d1a9415ad2b69b8c93becadead3d5363fa Mon Sep 17 00:00:00 2001 From: Alexander Rutkovsky Date: Thu, 7 Mar 2024 20:17:09 +0300 Subject: [PATCH] Fix sync (#2566) --- ydb/core/driver_lib/run/run.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp index d8dde2069bef..fef705936db6 100644 --- a/ydb/core/driver_lib/run/run.cpp +++ b/ydb/core/driver_lib/run/run.cpp @@ -173,18 +173,27 @@ class TDomainsInitializer : public IAppDataInitializer { } bool isExplicitTabletIds = domain.ExplicitCoordinatorsSize() + domain.ExplicitMediatorsSize() + domain.ExplicitAllocatorsSize(); - Y_ABORT_UNLESS(isExplicitTabletIds); Y_ABORT_UNLESS(domain.SSIdSize() == 0 || (domain.SSIdSize() == 1 && domain.GetSSId(0) == 1)); Y_ABORT_UNLESS(domain.HiveUidSize() == 0 || (domain.HiveUidSize() == 1 && domain.GetHiveUid(0) == 1)); TDomainsInfo::TDomain::TPtr domainPtr = nullptr; if (isExplicitTabletIds) { domainPtr = TDomainsInfo::TDomain::ConstructDomainWithExplicitTabletIds(domainName, domainId, schemeRoot, - planResolution, - domain.GetExplicitCoordinators(), - domain.GetExplicitMediators(), - domain.GetExplicitAllocators(), - poolTypes); + planResolution, domain.GetExplicitCoordinators(), domain.GetExplicitMediators(), + domain.GetExplicitAllocators(), poolTypes); + } else { // compatibility code + std::vector coordinators, mediators, allocators; + for (ui64 x : domain.GetCoordinator()) { + coordinators.push_back(TDomainsInfo::MakeTxCoordinatorID(domainId, x)); + } + for (ui64 x : domain.GetMediator()) { + mediators.push_back(TDomainsInfo::MakeTxMediatorID(domainId, x)); + } + for (ui64 x : domain.GetProxy()) { + allocators.push_back(TDomainsInfo::MakeTxAllocatorID(domainId, x)); + } + domainPtr = TDomainsInfo::TDomain::ConstructDomainWithExplicitTabletIds(domainName, domainId, schemeRoot, + planResolution, coordinators, mediators, allocators, poolTypes); } appData->DomainsInfo->AddDomain(domainPtr.Release());