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 a73d0825a0e branch-3.1: [fix](trash) Fix shadow variable causing 
garbage scheduling time errors #51647 (#52029)
a73d0825a0e is described below

commit a73d0825a0ea8d1a6b4dbc63e39754c100137300
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jun 20 17:16:27 2025 +0800

    branch-3.1: [fix](trash) Fix shadow variable causing garbage scheduling 
time errors #51647 (#52029)
    
    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 8469503b8ed..69f8703b974 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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to