diff options
| author | stanislav_shchetinin <st-shchetinin@ydb.tech> | 2025-04-21 15:03:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-21 15:03:26 +0300 |
| commit | d2f33847cfb36147544f73a1e72aaf0c22fe262d (patch) | |
| tree | a26c448bea3105045d06251e695fc5a3a5b1d5e6 | |
| parent | 98459abb35467fb21510ec9a289fcd51107ba8ea (diff) | |
| download | ydb-d2f33847cfb36147544f73a1e72aaf0c22fe262d.tar.gz | |
FIx ExportToS3WithRebootsTests.ShouldSucceedOnManyTable after auto dropping (#17459)
| -rw-r--r-- | .github/config/muted_ya.txt | 1 | ||||
| -rw-r--r-- | ydb/core/tx/schemeshard/schemeshard_export__create.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.github/config/muted_ya.txt b/.github/config/muted_ya.txt index 235790a85df..ac2ff4114a0 100644 --- a/.github/config/muted_ya.txt +++ b/.github/config/muted_ya.txt @@ -48,7 +48,6 @@ ydb/core/quoter/ut QuoterWithKesusTest.KesusRecreation ydb/core/quoter/ut QuoterWithKesusTest.PrefetchCoefficient ydb/core/statistics/aggregator/ut AnalyzeColumnshard.AnalyzeRebootColumnShard ydb/core/tx/datashard/ut_incremental_backup IncrementalBackup.ComplexRestoreBackupCollection+WithIncremental -ydb/core/tx/schemeshard/ut_export_reboots_s3 TExportToS3WithRebootsTests.ShouldSucceedOnManyTables ydb/core/tx/schemeshard/ut_login_large TSchemeShardLoginLargeTest.RemoveLogin_Many ydb/core/tx/schemeshard/ut_move_reboots TSchemeShardMoveRebootsTest.WithData ydb/core/tx/schemeshard/ut_move_reboots TSchemeShardMoveRebootsTest.WithDataAndPersistentPartitionStats diff --git a/ydb/core/tx/schemeshard/schemeshard_export__create.cpp b/ydb/core/tx/schemeshard/schemeshard_export__create.cpp index 0bf789cf4af..4dbd69a4efd 100644 --- a/ydb/core/tx/schemeshard/schemeshard_export__create.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_export__create.cpp @@ -559,7 +559,7 @@ private: PrepareDropping(ss, exportInfo, db, TExportInfo::EState::AutoDropping, [&](ui64 itemIdx) { exportInfo->PendingDropItems.push_back(itemIdx); isContinued = true; - AllocateTxId(exportInfo); + AllocateTxId(exportInfo, itemIdx); }); if (!isContinued) { AllocateTxId(exportInfo); @@ -760,7 +760,7 @@ private: const auto& item = exportInfo->Items.at(itemIdx); if (item.WaitTxId == InvalidTxId) { - if (item.SourcePathType == NKikimrSchemeOp::EPathTypeTable) { + if (item.SourcePathType == NKikimrSchemeOp::EPathTypeTable && item.State <= EState::Transferring) { pendingTables.emplace_back(itemIdx); } else { UploadScheme(exportInfo, itemIdx, ctx); |