thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-05 08:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with duplication of parts on restart

Browse Source
This commit is contained in:
Igr Mineev 2019-07-16 16:06:23 +03:00
parent d6b1035301
commit ad497fbaa1
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/src/Storages/MergeTree/DiskSpaceMonitor.h
View File

@ -352,6 +352,7 @@ public:
StoragePolicy(const String & name_, Volumes volumes_) : volumes(std::move(volumes_)), name(name_) { }
/// Returns disks ordered by volumes priority
Disks getDisks() const;
DiskPtr getAnyDisk() const;

24
dbms/src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -747,8 +747,11 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
auto disks = storage_policy->getDisks();
for (auto disk_ptr : disks)
/// Reversed order to load part from low priority disks firstly.
/// Used for keep part on low priority disk if duplication found
for (auto disk_it = disks.rbegin(); disk_it != disks.rend(); ++disk_it)
{
auto disk_ptr = *disk_it;
for (Poco::DirectoryIterator it(getFullPathOnDisk(disk_ptr)); it != end; ++it)
{
/// Skip temporary directories.
@ -861,8 +864,25 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
/// Assume that all parts are Committed, covered parts will be detected and marked as Outdated later
part->state = DataPartState::Committed;
if (!data_parts_indexes.insert(part).second)
auto [part_ptr, insertion_complete] = data_parts_indexes.insert(part);
if (!insertion_complete)
{
if (*part_ptr)
{
if ((*part_ptr)->name == part->name)
{
/// Same parts. Checking if them are equal
part->checksums.checkEqual((*part_ptr)->checksums, true);
/// Duplication on greater priority disk. Do not add this part.
LOG_DEBUG(log, "Found equal part. Moving to detach (" << part->name << " on " << part->getFullPath() << ")");
part->renameToDetached("");
continue;
}
}
throw Exception("Part " + part->name + " already exists", ErrorCodes::DUPLICATE_DATA_PART);
}
}
if (has_non_adaptive_parts && has_adaptive_parts && !settings.enable_mixed_granularity_parts)