This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new cb60589c0a6 branch-2.1: [fix](trash) Fix shadow variable causing
garbage scheduling time errors #51647 (#51996)
cb60589c0a6 is described below
commit cb60589c0a6547c7ad802b8eea4bde33bcf7c98f
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Jun 28 11:12:25 2025 +0800
branch-2.1: [fix](trash) Fix shadow variable causing garbage scheduling
time errors #51647 (#51996)
Cherry-picked from #51647
Co-authored-by: deardeng <[email protected]>
---
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 6a87ca434c3..b7395c45fe9 100644
--- a/be/src/olap/olap_server.cpp
+++ b/be/src/olap/olap_server.cpp
@@ -323,7 +323,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);
@@ -338,6 +338,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: [email protected]
For additional commands, e-mail: [email protected]
