This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 2a1f9c4dd97 Revert "branch-3.1: [fix](trash) Fix shadow variable
causing garbage scheduling time errors #51647 (#52029)" (#54075)
2a1f9c4dd97 is described below
commit 2a1f9c4dd970c60e5062fd3f511c4712dd10e29c
Author: deardeng <[email protected]>
AuthorDate: Wed Jul 30 19:50:50 2025 +0800
Revert "branch-3.1: [fix](trash) Fix shadow variable causing garbage
scheduling time errors #51647 (#52029)" (#54075)
This reverts commit a73d0825a0ea8d1a6b4dbc63e39754c100137300.
---
be/src/olap/olap_server.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/be/src/olap/olap_server.cpp b/be/src/olap/olap_server.cpp
index b64d278173c..b4f56216c67 100644
--- a/be/src/olap/olap_server.cpp
+++ b/be/src/olap/olap_server.cpp
@@ -389,7 +389,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;
- curr_interval = uint32_t(max_interval * ratio);
+ auto curr_interval = uint32_t(max_interval * ratio);
curr_interval = std::max(curr_interval, min_interval);
curr_interval = std::min(curr_interval, max_interval);
@@ -404,8 +404,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]
