Skip to content

Commit 77feb49

Browse files
authored
24-4-4-hotfix: Don't try checking for merge when operation limit already exceeded (#18554)
2 parents d5b3397 + 3f22fdf commit 77feb49

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
@@ -407,9 +407,11 @@ bool TTxStoreTableStats::PersistSingleStats(const TPathId& pathId,
407407
const TTableIndexInfo* index = Self->Indexes.Value(pathElement->ParentPathId, nullptr).Get();
408408
const TTableInfo* mainTableForIndex = Self->GetMainTableForIndex(pathId);
409409

410+
TString errStr;
410411
const auto forceShardSplitSettings = Self->SplitSettings.GetForceShardSplitSettings();
411412
TVector<TShardIdx> shardsToMerge;
412413
if ((!index || index->State == NKikimrSchemeOp::EIndexStateReady)
414+
&& Self->CheckInFlightLimit(NKikimrSchemeOp::ESchemeOpSplitMergeTablePartitions, errStr)
413415
&& table->CheckCanMergePartitions(Self->SplitSettings, forceShardSplitSettings, shardIdx, shardsToMerge, mainTableForIndex)
414416
) {
415417
TTxId txId = Self->GetCachedTxId(ctx);

0 commit comments

Comments
 (0)