Skip to content

Commit d2f3384

Browse files
FIx ExportToS3WithRebootsTests.ShouldSucceedOnManyTable after auto dropping (#17459)
1 parent 98459ab commit d2f3384

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/config/muted_ya.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ ydb/core/quoter/ut QuoterWithKesusTest.KesusRecreation
4848
ydb/core/quoter/ut QuoterWithKesusTest.PrefetchCoefficient
4949
ydb/core/statistics/aggregator/ut AnalyzeColumnshard.AnalyzeRebootColumnShard
5050
ydb/core/tx/datashard/ut_incremental_backup IncrementalBackup.ComplexRestoreBackupCollection+WithIncremental
51-
ydb/core/tx/schemeshard/ut_export_reboots_s3 TExportToS3WithRebootsTests.ShouldSucceedOnManyTables
5251
ydb/core/tx/schemeshard/ut_login_large TSchemeShardLoginLargeTest.RemoveLogin_Many
5352
ydb/core/tx/schemeshard/ut_move_reboots TSchemeShardMoveRebootsTest.WithData
5453
ydb/core/tx/schemeshard/ut_move_reboots TSchemeShardMoveRebootsTest.WithDataAndPersistentPartitionStats

ydb/core/tx/schemeshard/schemeshard_export__create.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ struct TSchemeShard::TExport::TTxProgress: public TSchemeShard::TXxport::TTxBase
559559
PrepareDropping(ss, exportInfo, db, TExportInfo::EState::AutoDropping, [&](ui64 itemIdx) {
560560
exportInfo->PendingDropItems.push_back(itemIdx);
561561
isContinued = true;
562-
AllocateTxId(exportInfo);
562+
AllocateTxId(exportInfo, itemIdx);
563563
});
564564
if (!isContinued) {
565565
AllocateTxId(exportInfo);
@@ -760,7 +760,7 @@ struct TSchemeShard::TExport::TTxProgress: public TSchemeShard::TXxport::TTxBase
760760
const auto& item = exportInfo->Items.at(itemIdx);
761761

762762
if (item.WaitTxId == InvalidTxId) {
763-
if (item.SourcePathType == NKikimrSchemeOp::EPathTypeTable) {
763+
if (item.SourcePathType == NKikimrSchemeOp::EPathTypeTable && item.State <= EState::Transferring) {
764764
pendingTables.emplace_back(itemIdx);
765765
} else {
766766
UploadScheme(exportInfo, itemIdx, ctx);

0 commit comments

Comments
 (0)