Skip to content

Commit 607408b

Browse files
authored
25-1: Don't try checking for merge when operation limit already exceeded (#18503)
2 parents 0cd9040 + 3907ecf commit 607408b

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

ydb/core/tx/schemeshard/schemeshard__table_stats.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,11 @@ bool TTxStoreTableStats::PersistSingleStats(const TPathId& pathId,
421421
const TTableIndexInfo* index = Self->Indexes.Value(pathElement->ParentPathId, nullptr).Get();
422422
const TTableInfo* mainTableForIndex = Self->GetMainTableForIndex(pathId);
423423

424+
TString errStr;
424425
const auto forceShardSplitSettings = Self->SplitSettings.GetForceShardSplitSettings();
425426
TVector<TShardIdx> shardsToMerge;
426427
if ((!index || index->State == NKikimrSchemeOp::EIndexStateReady)
428+
&& Self->CheckInFlightLimit(NKikimrSchemeOp::ESchemeOpSplitMergeTablePartitions, errStr)
427429
&& table->CheckCanMergePartitions(Self->SplitSettings, forceShardSplitSettings, shardIdx, shardsToMerge, mainTableForIndex)
428430
) {
429431
TTxId txId = Self->GetCachedTxId(ctx);

0 commit comments

Comments
 (0)