Skip to content

25.8.16 Backport of #95597 - Fix zero‑copy unlock check before part dir move #1738

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

Open
mkmkme wants to merge 1 commit into
base: releases/25.8.16
Choose a base branch
from
+5 −7
Open

25.8.16 Backport of #95597 - Fix zero‑copy unlock check before part dir move #1738

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,11 @@ void DataPartStorageOnDiskBase::remove(
return;
}

/// Evaluate can_remove_callback before moving the directory so zero-copy reference checks
/// use the current (existing) path. We intentionally don't update part_dir to avoid races.
if (!can_remove_description)
can_remove_description.emplace(can_remove_callback());

try
{
disk->moveDirectory(from, to);
Expand All @@ -766,9 +771,6 @@ void DataPartStorageOnDiskBase::remove(
if (e.code() == ErrorCodes::FILE_DOESNT_EXIST)
{
LOG_ERROR(log, "Directory {} (part to remove) doesn't exist or one of nested files has gone. Most likely this is due to manual removing. This should be discouraged. Ignoring.", fullPath(disk, from));
/// We will never touch this part again, so unlocking it from zero-copy
if (!can_remove_description)
can_remove_description.emplace(can_remove_callback());
return;
}
throw;
Expand All @@ -779,10 +781,6 @@ void DataPartStorageOnDiskBase::remove(
{
LOG_ERROR(log, "Directory {} (part to remove) doesn't exist or one of nested files has gone. "
"Most likely this is due to manual removing. This should be discouraged. Ignoring.", fullPath(disk, from));
/// We will never touch this part again, so unlocking it from zero-copy
if (!can_remove_description)
can_remove_description.emplace(can_remove_callback());

return;
}
throw;
Expand Down
Loading