Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Paths & shards quota & consumption metrics #13723

Merged
merged 1 commit into from
Jan 22, 2025
Merged

Paths & shards quota & consumption metrics #13723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ydb/core/protos/counters_schemeshard.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,11 @@ enum ESimpleCounters {
COUNTER_IN_FLIGHT_OPS_TxDropTransferCascade = 186 [(CounterOpts) = {Name: "InFlightOps/DropTransferCascade"}];

COUNTER_TRANSFER_COUNT = 187 [(CounterOpts) = {Name: "Transfers"}];

COUNTER_PATHS_QUOTA = 188 [(CounterOpts) = {Name: "PathsQuota"}];
COUNTER_PATHS = 189 [(CounterOpts) = {Name: "Paths"}];
COUNTER_SHARDS_QUOTA = 190 [(CounterOpts) = {Name: "ShardsQuota"}];
COUNTER_SHARDS = 191 [(CounterOpts) = {Name: "Shards"}];
}

enum ECumulativeCounters {
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/olap/operations/create_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,8 @@ class TCreateOlapStore: public TSubOperation {
context.SS->ClearDescribePathCaches(dstPath.Base());
context.OnComplete.PublishToSchemeBoard(OperationId, dstPath.Base()->PathId);

dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->AddInternalShards(txState);
dstPath.DomainInfo()->IncPathsInside(context.SS);
dstPath.DomainInfo()->AddInternalShards(txState, context.SS);
dstPath.Base()->IncShardsInside(shardsToCreate);
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop

Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/olap/operations/create_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,9 +861,9 @@ class TCreateColumnTable: public TSubOperation {
context.SS->ClearDescribePathCaches(dstPath.Base());
context.OnComplete.PublishToSchemeBoard(OperationId, dstPath.Base()->PathId);

dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->IncPathsInside(context.SS);
if (!storeInfo) {
dstPath.DomainInfo()->AddInternalShards(txState);
dstPath.DomainInfo()->AddInternalShards(txState, context.SS);
dstPath.Base()->IncShardsInside(tableInfo->GetOwnedColumnShardsVerified().size());
}
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/olap/operations/drop_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class TPropose: public TSubOperationState {
context.SS->PersistDropStep(db, pathId, step, OperationId);

auto domainInfo = context.SS->ResolveDomainInfo(pathId);
domainInfo->DecPathsInside();
domainInfo->DecPathsInside(context.SS);
DecAliveChildrenDirect(OperationId, parentDir, context); // for correct discard of ChildrenExist prop

context.SS->TabletCounters->Simple()[COUNTER_USER_ATTRIBUTES_COUNT].Sub(path->UserAttrs->Size());
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/olap/operations/drop_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class TPropose: public TSubOperationState {
context.SS->PersistDropStep(db, pathId, step, OperationId);

auto domainInfo = context.SS->ResolveDomainInfo(pathId);
domainInfo->DecPathsInside();
domainInfo->DecPathsInside(context.SS);
DecAliveChildrenDirect(OperationId, parentDir, context); // for correct discard of ChildrenExist prop

context.SS->TabletCounters->Simple()[COUNTER_USER_ATTRIBUTES_COUNT].Sub(path->UserAttrs->Size());
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__delete_tablet_reply.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ struct TSchemeShard::TTxDeleteTabletReply : public TSchemeShard::TRwTxBase {
path->DecShardsInside();

auto domain = Self->ResolveDomainInfo(path);
domain->RemoveInternalShard(ShardIdx);
domain->RemoveInternalShard(ShardIdx, Self);
switch (tabletType) {
case ETabletType::SequenceShard:
domain->RemoveSequenceShard(ShardIdx);
Expand Down
8 changes: 4 additions & 4 deletions ydb/core/tx/schemeshard/schemeshard__init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1511,7 +1511,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> {
}

TSubDomainInfo::TPtr rootDomainInfo = new TSubDomainInfo(version, Self->RootPathId());
rootDomainInfo->SetSchemeLimits(rootLimits);
rootDomainInfo->SetSchemeLimits(rootLimits, Self);
rootDomainInfo->SetSecurityStateVersion(row.GetValueOrDefault<Schema::SubDomains::SecurityStateVersion>());

rootDomainInfo->InitializeAsGlobal(Self->CreateRootProcessingParams(ctx));
Expand Down Expand Up @@ -1551,7 +1551,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> {
TTabletId sharedHiveId = rowset.GetValue<Schema::SubDomains::SharedHiveId>();
domainInfo->SetSharedHive(sharedHiveId);

domainInfo->SetSchemeLimits(LoadSchemeLimits(rootLimits, rowset));
domainInfo->SetSchemeLimits(LoadSchemeLimits(rootLimits, rowset), !Self->IsDomainSchemeShard ? Self : nullptr);

if (rowset.HaveValue<Schema::SubDomains::DeclaredSchemeQuotas>()) {
NKikimrSubDomains::TSchemeQuotas declaredSchemeQuotas;
Expand Down Expand Up @@ -4007,7 +4007,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> {
path->IncShardsInside();

auto domainInfo = Self->ResolveDomainInfo(pathId); //domain should't be dropped?
domainInfo->AddInternalShard(shardIdx, Self->IsBackupTable(pathId));
domainInfo->AddInternalShard(shardIdx, Self, Self->IsBackupTable(pathId));

switch (si.second.TabletType) {
case ETabletType::DataShard:
Expand Down Expand Up @@ -4115,7 +4115,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> {
if (!path->IsRoot()) {
const bool isBackupTable = Self->IsBackupTable(item.first);
parent->IncAliveChildrenPrivate(isBackupTable);
inclusiveDomainInfo->IncPathsInside(1, isBackupTable);
inclusiveDomainInfo->IncPathsInside(Self, 1, isBackupTable);
}

Self->TabletCounters->Simple()[COUNTER_USER_ATTRIBUTES_COUNT].Add(path->UserAttrs->Size());
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__init_root.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ struct TSchemeShard::TTxInitTenantSchemeShard : public TSchemeShard::TRwTxBase {
Self->PersistShardMapping(db, shardIdx, id, Self->RootPathId(), InvalidTxId, type);

subdomain->AddPrivateShard(shardIdx);
subdomain->AddInternalShard(shardIdx);
subdomain->AddInternalShard(shardIdx, Self);
}
}

Expand Down Expand Up @@ -386,7 +386,7 @@ struct TSchemeShard::TTxInitTenantSchemeShard : public TSchemeShard::TRwTxBase {
subdomain->AddStoragePool(x);
}

subdomain->SetSchemeLimits(TSchemeLimits::FromProto(schemeLimits));
subdomain->SetSchemeLimits(TSchemeLimits::FromProto(schemeLimits), Self);

if (record.HasDeclaredSchemeQuotas()) {
subdomain->ApplyDeclaredSchemeQuotas(record.GetDeclaredSchemeQuotas(), ctx.Now());
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_alter_bsv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ class TAlterBlockStoreVolume: public TSubOperation {
context.OnComplete.PublishToSchemeBoard(OperationId, path.Base()->PathId);

TSubDomainInfo::TPtr domainInfo = path.DomainInfo();
domainInfo->AddInternalShards(txState);
domainInfo->AddInternalShards(txState, context.SS);

path.Base()->IncShardsInside(shardsToCreate);

Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_alter_extsubdomain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ void RegisterChanges(const TTxState& txState, const TTxId operationTxId, TOperat
context.DbChanges.PersistShard(shardIdx);

// Path
path.DomainInfo()->AddInternalShard(shardIdx);
path.DomainInfo()->AddInternalShard(shardIdx, context.SS);
path.Base()->IncShardsInside(1);

// Extsubdomain data
Expand Down Expand Up @@ -497,7 +497,7 @@ class TCreateHive: public TSubOperationState {
{
auto subdomain = context.SS->SubDomains.at(txState->TargetPathId);
subdomain->AddPrivateShard(shardIdx);
subdomain->AddInternalShard(shardIdx);
subdomain->AddInternalShard(shardIdx, context.SS);

subdomain->SetTenantHiveIDPrivate(createdTabletId);

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ class TAlterPQ: public TSubOperation {
context.SS->ClearDescribePathCaches(path.Base());
context.OnComplete.PublishToSchemeBoard(OperationId, path.Base()->PathId);

path.DomainInfo()->AddInternalShards(txState);
path.DomainInfo()->AddInternalShards(txState, context.SS);
path.DomainInfo()->IncPQPartitionsInside(partitionsToCreate);
path.DomainInfo()->UpdatePQReservedStorage(oldReserve.Storage, reserve.Storage);
path.Base()->IncShardsInside(shardsToCreate);
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_alter_solomon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ class TAlterSolomon: public TSubOperation {

context.SS->PersistTxState(db, OperationId);

path.DomainInfo()->AddInternalShards(txState);
path.DomainInfo()->AddInternalShards(txState, context.SS);

SetState(NextState());
return result;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_alter_subdomain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ class TAlterSubDomain: public TSubOperation {
context.SS->PersistTxState(db, OperationId);
context.OnComplete.ActivateTx(OperationId);

path.DomainInfo()->AddInternalShards(txState);
path.DomainInfo()->AddInternalShards(txState, context.SS);
path.Base()->IncShardsInside(shardsToCreate);

SetState(NextState());
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_blob_depot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,8 @@ namespace NKikimr::NSchemeShard {
context.OnComplete.PublishToSchemeBoard(OperationId, parentPath->PathId);
context.SS->ClearDescribePathCaches(dstPath.Base());
context.OnComplete.PublishToSchemeBoard(OperationId, dstPath->PathId);
dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->AddInternalShards(txState);
dstPath.DomainInfo()->IncPathsInside(context.SS);
dstPath.DomainInfo()->AddInternalShards(txState, context.SS);
dstPath->IncShardsInside();
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop

Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ void UpdatePartitioningForCopyTable(TOperationId operationId, TTxState &txState,
dstTableInfo->PerShardPartitionConfig.erase(shard.Idx);
context.SS->PersistShardDeleted(db, shard.Idx, context.SS->ShardInfos[shard.Idx].BindedChannels);
context.SS->ShardInfos.erase(shard.Idx);
domainInfo->RemoveInternalShard(shard.Idx);
domainInfo->RemoveInternalShard(shard.Idx, context.SS);
context.SS->DecrementPathDbRefCount(pathId, "remove shard from txState");
context.SS->OnShardRemoved(shard.Idx);
}
Expand Down Expand Up @@ -934,7 +934,7 @@ void UpdatePartitioningForCopyTable(TOperationId operationId, TTxState &txState,
ui32 newShardCout = dstTableInfo->GetPartitions().size();

dstPath->SetShardsInside(newShardCout);
domainInfo->AddInternalShards(txState);
domainInfo->AddInternalShards(txState, context.SS);

context.SS->PersistTable(db, txState.TargetPathId);
context.SS->PersistTxState(db, operationId);
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_copy_sequence.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ class TCopySequence: public TSubOperation {
context.SS->ClearDescribePathCaches(dstPath.Base());
context.OnComplete.PublishToSchemeBoard(OperationId, dstPath->PathId);

domainInfo->IncPathsInside();
domainInfo->IncPathsInside(context.SS);
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop

SetState(NextState());
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,8 +712,8 @@ class TCopyTable: public TSubOperation {
const ui32 shardsToCreate = tableInfo->GetPartitions().size();
Y_VERIFY_S(shardsToCreate <= maxShardsToCreate, "shardsToCreate: " << shardsToCreate << " maxShardsToCreate: " << maxShardsToCreate);

dstPath.DomainInfo()->IncPathsInside(1, isBackup);
dstPath.DomainInfo()->AddInternalShards(txState, isBackup);
dstPath.DomainInfo()->IncPathsInside(context.SS, 1, isBackup);
dstPath.DomainInfo()->AddInternalShards(txState, context.SS, isBackup);
dstPath.Base()->IncShardsInside(shardsToCreate);
IncAliveChildrenSafeWithUndo(OperationId, parent, context, isBackup);

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_create_backup_collection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class TCreateBackupCollection : public TSubOperation {
auto pathEl = CreateBackupCollectionPathElement(dstPath);

IncAliveChildrenDirect(OperationId, rootPath, context); // for correct discard of ChildrenExist prop
rootPath.DomainInfo()->IncPathsInside();
rootPath.DomainInfo()->IncPathsInside(context.SS);

auto backupCollection = TBackupCollectionInfo::Create(desc);
context.SS->BackupCollections[dstPath->PathId] = backupCollection;
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_create_bsv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ class TCreateBlockStoreVolume: public TSubOperation {
context.SS->ClearDescribePathCaches(dstPath.Base());
context.OnComplete.PublishToSchemeBoard(OperationId, dstPath.Base()->PathId);

dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->AddInternalShards(txState);
dstPath.DomainInfo()->IncPathsInside(context.SS);
dstPath.DomainInfo()->AddInternalShards(txState, context.SS);
dstPath.Base()->IncShardsInside(shardsToCreate);
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ class TNewCdcStream: public TSubOperation {
context.SS->CdcStreams[pathId] = stream;
context.SS->IncrementPathDbRefCount(pathId);

streamPath.DomainInfo()->IncPathsInside();
streamPath.DomainInfo()->IncPathsInside(context.SS);
IncAliveChildrenSafeWithUndo(OperationId, tablePath, context); // for correct discard of ChildrenExist prop

context.OnComplete.ActivateTx(OperationId);
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_create_external_data_source.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ class TCreateExternalDataSource : public TSubOperation {
context.SS,
context.OnComplete);

dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->IncPathsInside(context.SS);
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop

SetState(NextState());
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_create_external_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ class TCreateExternalTable: public TSubOperation {
context.SS,
context.OnComplete);

dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->IncPathsInside(context.SS);
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop

SetState(NextState());
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_create_extsubdomain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ class TCreateExtSubDomain: public TSubOperation {
context.OnComplete.PublishToSchemeBoard(OperationId, newNode->PathId);

Y_ABORT_UNLESS(0 == txState.Shards.size());
parentPath.DomainInfo()->IncPathsInside();
parentPath.DomainInfo()->IncPathsInside(context.SS);
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop

SetState(NextState());
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_create_fs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,8 @@ THolder<TProposeResponse> TCreateFileStore::Propose(
context.SS->ClearDescribePathCaches(dstPath.Base());
context.OnComplete.PublishToSchemeBoard(OperationId, dstPath.Base()->PathId);

dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->AddInternalShards(txState);
dstPath.DomainInfo()->IncPathsInside(context.SS);
dstPath.DomainInfo()->AddInternalShards(txState, context.SS);
dstPath.Base()->IncShardsInside(shardsToCreate);
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_create_index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ class TCreateTableIndex: public TSubOperation {

context.OnComplete.ActivateTx(OperationId);

dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->IncPathsInside(context.SS);
IncAliveChildrenSafeWithUndo(OperationId, parentPath, context); // for correct discard of ChildrenExist prop

SetState(NextState());
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,8 @@ class TCreateKesus: public TSubOperation {
context.SS->ClearDescribePathCaches(dstPath.Base());
context.OnComplete.PublishToSchemeBoard(OperationId, dstPath.Base()->PathId);

dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->AddInternalShards(txState);
dstPath.DomainInfo()->IncPathsInside(context.SS);
dstPath.DomainInfo()->AddInternalShards(txState, context.SS);

dstPath.Base()->IncShardsInside();
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,8 +545,8 @@ class TCreatePQ: public TSubOperation {
context.SS->ClearDescribePathCaches(dstPath.Base());
context.OnComplete.PublishToSchemeBoard(OperationId, dstPath.Base()->PathId);

dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->AddInternalShards(txState);
dstPath.DomainInfo()->IncPathsInside(context.SS);
dstPath.DomainInfo()->AddInternalShards(txState, context.SS);
dstPath.DomainInfo()->IncPQPartitionsInside(partitionsToCreate);
dstPath.DomainInfo()->IncPQReservedStorage(reserve.Storage);

Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_create_replication.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ class TCreateReplication: public TSubOperation {

context.SS->IncrementPathDbRefCount(path->PathId);
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
parentPath.DomainInfo()->IncPathsInside();
parentPath.DomainInfo()->IncPathsInside(context.SS);

if (desc.GetConfig().GetSrcConnectionParams().GetCredentialsCase() == NKikimrReplication::TConnectionParams::CREDENTIALS_NOT_SET) {
desc.MutableConfig()->MutableSrcConnectionParams()->MutableOAuthToken()->SetToken(BUILTIN_ACL_ROOT);
Expand All @@ -425,7 +425,7 @@ class TCreateReplication: public TSubOperation {
txState.State = TTxState::CreateParts;

path->IncShardsInside();
parentPath.DomainInfo()->AddInternalShards(txState);
parentPath.DomainInfo()->AddInternalShards(txState, context.SS);

if (parentPath->HasActiveChanges()) {
const auto parentTxId = parentPath->PlannedToCreate() ? parentPath->CreateTxId : parentPath->LastTxId;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard__operation_create_resource_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ class TCreateResourcePool : public TSubOperation {

IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, dstPath, context.SS, context.OnComplete);

dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->IncPathsInside(context.SS);
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop

SetState(NextState());
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_create_rtmr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ class TCreateRTMR: public TSubOperation {
Y_ABORT_UNLESS(shardsToCreate == txState.Shards.size(), "shardsToCreate=%ld != txStateShards=%ld",
shardsToCreate, txState.Shards.size());

dstPath.DomainInfo()->IncPathsInside();
dstPath.DomainInfo()->AddInternalShards(txState);
dstPath.DomainInfo()->IncPathsInside(context.SS);
dstPath.DomainInfo()->AddInternalShards(txState, context.SS);

dstPath.Base()->IncShardsInside(shardsToCreate);
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_create_sequence.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ class TCreateSequence : public TSubOperation {
txState.Shards.emplace_back(sequenceShard, ETabletType::SequenceShard, TTxState::CreateParts);
txState.State = TTxState::CreateParts;
context.SS->PathsById.at(domainPathId)->IncShardsInside();
domainInfo->AddInternalShard(sequenceShard);
domainInfo->AddInternalShard(sequenceShard, context.SS);
domainInfo->AddSequenceShard(sequenceShard);
} else {
txState.Shards.emplace_back(sequenceShard, ETabletType::SequenceShard, TTxState::ConfigureParts);
Expand Down Expand Up @@ -576,7 +576,7 @@ class TCreateSequence : public TSubOperation {
context.SS->ClearDescribePathCaches(dstPath.Base());
context.OnComplete.PublishToSchemeBoard(OperationId, dstPath->PathId);

domainInfo->IncPathsInside();
domainInfo->IncPathsInside(context.SS);
IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop

SetState(NextState());
Expand Down
Loading
Loading