This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 75d29d8e104 branch-3.0: [fix](trash) Fix shadow variable causing
garbage scheduling time errors #51647 (#51687)
75d29d8e104 is described below
commit 75d29d8e104f1f88819cf32e5b2a31eb2efec40c
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jun 20 09:54:22 2025 +0800
branch-3.0: [fix](trash) Fix shadow variable causing garbage scheduling
time errors #51647 (#51687)
Cherry-picked from #51647
Co-authored-by: deardeng <deng...@selectdb.com>
---
be/src/olap/olap_server.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/be/src/olap/olap_server.cpp b/be/src/olap/olap_server.cpp
index df201c7d699..fc601903a54 100644
--- a/be/src/olap/olap_server.cpp
+++ b/be/src/olap/olap_server.cpp
@@ -388,7 +388,7 @@ 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;
- auto curr_interval = uint32_t(max_interval * ratio);
+ curr_interval = uint32_t(max_interval * ratio);
curr_interval = std::max(curr_interval, min_interval);
curr_interval = std::min(curr_interval, max_interval);
@@ -403,6 +403,8 @@ 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: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
