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 967df479ea3 Revert "branch-3.0: [fix](trash) Fix shadow variable
causing garbage … (#54073)
967df479ea3 is described below
commit 967df479ea39298d9f0598c2ac207de1dd92d065
Author: deardeng <[email protected]>
AuthorDate: Thu Jul 31 21:04:18 2025 +0800
Revert "branch-3.0: [fix](trash) Fix shadow variable causing garbage …
(#54073)
…scheduling time errors #51647 (#51687)"
This reverts commit 75d29d8e104f1f88819cf32e5b2a31eb2efec40c.
---
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 f7125b97567..36971ba5e9b 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]
