Skip to content

Cleanup export manifests - attempt to prevent crash #1167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Enmk merged 3 commits into from
Nov 25, 2025
Merged

Cleanup export manifests - attempt to prevent crash #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f565e95
cleanup export manifests at shutdown
arthurpassos Nov 25, 2025
6cec570
reorder
arthurpassos Nov 25, 2025
6a99acf
I am just too crazy at this point
arthurpassos Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Storages/StorageMergeTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,11 @@ void StorageMergeTree::shutdown(bool)

if (deduplication_log)
deduplication_log->shutdown();

{
std::lock_guard lock(export_manifests_mutex);
export_manifests.clear();
}
}


Expand Down
11 changes: 11 additions & 0 deletions src/Storages/StorageReplicatedMergeTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6014,6 +6014,17 @@ void StorageReplicatedMergeTree::shutdown(bool)
/// Wait for all of them
std::lock_guard lock(data_parts_exchange_ptr->rwlock);
}

{
std::lock_guard lock(export_merge_tree_partition_mutex);
export_merge_tree_partition_task_entries.clear();
}

{
std::lock_guard lock(export_manifests_mutex);
export_manifests.clear();
}

LOG_TRACE(log, "Shutdown finished");
}

Expand Down
Loading