thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix another bug in attach partition

Browse Source
This commit is contained in:
Alexander Tokmakov 2023-08-24 19:10:25 +02:00
parent e67c002cb0
commit e1d135dc01
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Storages/MergeTree/IMergeTreeDataPart.h
View File

@ -264,6 +264,8 @@ public:
/// Some old parts don't have metadata version, so we set it to the current table's version when loading the part
bool old_part_with_no_metadata_version_on_disk = false;
bool new_part_was_committed_to_zookeeper_after_rename_on_disk = false;
using TTLInfo = MergeTreeDataPartTTLInfo;
using TTLInfos = MergeTreeDataPartTTLInfos;

23
src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
View File

@ -641,6 +641,27 @@ bool ReplicatedMergeTreeSinkImpl<false>::writeExistingPart(MergeTreeData::Mutabl
Stopwatch watch;
ProfileEventsScope profile_events_scope;
String original_part_dir = part->getDataPartStorage().getPartDirectory();
auto try_rollback_part_rename = [this, &part, &original_part_dir]()
{
if (original_part_dir == part->getDataPartStorage().getPartDirectory())
return;
if (part->new_part_was_committed_to_zookeeper_after_rename_on_disk)
return;
/// Probably we have renamed the part on disk, but then failed to commit it to ZK.
/// We should rename it back, otherwise it will be lost (e.g. if it was a part from detached/ and we failed to attach it).
try
{
part->renameTo(original_part_dir, /*remove_new_dir_if_exists*/ false);
}
catch (...)
{
tryLogCurrentException(log);
}
};
try
{
part->version.setCreationTID(Tx::PrehistoricTID, nullptr);
@ -654,6 +675,7 @@ bool ReplicatedMergeTreeSinkImpl<false>::writeExistingPart(MergeTreeData::Mutabl
}
catch (...)
{
try_rollback_part_rename();
PartLog::addNewPart(storage.getContext(), PartLog::PartLogEntry(part, watch.elapsed(), profile_events_scope.getSnapshot()), ExecutionStatus::fromCurrentException("", true));
throw;
}
@ -1001,6 +1023,7 @@ std::pair<std::vector<String>, bool> ReplicatedMergeTreeSinkImpl<async_insert>::
Coordination::Error multi_code = zookeeper->tryMultiNoThrow(ops, responses); /// 1 RTT
if (multi_code == Coordination::Error::ZOK)
{
part->new_part_was_committed_to_zookeeper_after_rename_on_disk = true;
transaction.commit();
storage.merge_selecting_task->schedule();