Skip to content

Revert "[fix](trash) Fix shadow variable causing garbage scheduling t… #54076

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
dataroaring merged 2 commits into from
Aug 8, 2025
Merged

Revert "[fix](trash) Fix shadow variable causing garbage scheduling t… #54076

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb5e30c
Revert "[fix](trash) Fix shadow variable causing garbage scheduling t…
deardeng Jul 30, 2025
1ccc076
fix compile
deardeng Aug 7, 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
9 changes: 4 additions & 5 deletions be/src/olap/olap_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,9 +386,10 @@ void StorageEngine::_garbage_sweeper_thread_callback() {
// when usage = 0.88, ratio is approximately 0.0057.
double ratio = (1.1 * (pi / 2 - std::atan(usage * 100 / 5 - 14)) - 0.28) / pi;
ratio = ratio > 0 ? ratio : 0;
curr_interval = uint32_t(max_interval * ratio);
curr_interval = std::max(curr_interval, min_interval);
curr_interval = std::min(curr_interval, max_interval);
// TODO(dx): fix it
auto curr_interval_not_work = uint32_t(max_interval * ratio);
curr_interval_not_work = std::max(curr_interval_not_work, min_interval);
curr_interval_not_work = std::min(curr_interval_not_work, max_interval);

// start clean trash and update usage.
Status res = start_trash_sweep(&usage);
Expand All @@ -401,8 +402,6 @@ void StorageEngine::_garbage_sweeper_thread_callback() {
<< "see previous message for detail. err code=" << res;
// do nothing. continue next loop.
}
LOG(INFO) << "trash thread check usage=" << usage << " ratio=" << ratio
<< " curr_interval=" << curr_interval;
} while (!_stop_background_threads_latch.wait_for(std::chrono::seconds(curr_interval)));
}

Expand Down
Loading