This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new b9c1b665d52 Revert "[fix](trash) Fix shadow variable causing garbage
scheduling t… (#54076)
b9c1b665d52 is described below
commit b9c1b665d52d78ad1fd98b9728ac0d3bf38e47cf
Author: deardeng <[email protected]>
AuthorDate: Fri Aug 8 21:52:38 2025 +0800
Revert "[fix](trash) Fix shadow variable causing garbage scheduling t…
(#54076)
…ime errors (#51647)"
This reverts commit 9c8cf193ad58690e0870d33ec6d392efc3283319.
---
be/src/olap/olap_server.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/be/src/olap/olap_server.cpp b/be/src/olap/olap_server.cpp
index 22338d45034..6a84081327f 100644
--- a/be/src/olap/olap_server.cpp
+++ b/be/src/olap/olap_server.cpp
@@ -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);
@@ -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)));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
