Skip to content

Storage: Fix data race in DeltaMergeStore::checkSegmentUpdate #10459

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
ti-chi-bot merged 2 commits into from
Sep 26, 2025
Merged

Storage: Fix data race in DeltaMergeStore::checkSegmentUpdate #10459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ee493f
Fix data race in checkSegmentUpdate
JaySon-Huang Sep 23, 2025
2c6c7f2
Add more debug log for random test on RowKey.ToNextKeyIntHandle
JaySon-Huang Sep 26, 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
12 changes: 7 additions & 5 deletions dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,11 +1707,13 @@ bool DeltaMergeStore::checkSegmentUpdate(
if (shutdown_called.load(std::memory_order_relaxed))
return;

auto [added, heavy] = background_tasks.tryAddTask(
task,
thread_type,
std::max(id_to_segment.size() * 2, background_pool.getNumberOfThreads() * 3),
log);
size_t max_task_num = 0;
{
std::shared_lock lock(read_write_mutex); // protect `id_to_segment`
max_task_num = std::max(id_to_segment.size() * 2, background_pool.getNumberOfThreads() * 3);
}

auto [added, heavy] = background_tasks.tryAddTask(task, thread_type, max_task_num, log);
// Prevent too many tasks.
if (!added)
return;
Expand Down
6 changes: 4 additions & 2 deletions dbms/src/Storages/DeltaMerge/tests/gtest_key_range.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,11 @@ TEST(RowKey, ToNextKeyIntHandle)
key_end.insert(key_end.end(), rand_suffix.begin(), rand_suffix.end());
LOG_INFO(
Logger::get(),
"key_end={} rand_suffix={}",
"key_end={} rand_length={} rand_suffix={} rand_suffix_size={}",
key_end.toDebugString(),
Redact::keyToDebugString(rand_suffix.data(), rand_length));
rand_length,
Redact::keyToDebugString(rand_suffix.data(), rand_length),
rand_suffix.size());

const auto range_keys = std::make_shared<RegionRangeKeys>(
RecordKVFormat::genKey(table_id, 0),
Expand Down