This is an automated email from the ASF dual-hosted git repository.

w41ter 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 64f30f3d8f9 branch-3.0: [fix](clone) Fix the skipped link file due to 
the stale value #46009 (#46067)
64f30f3d8f9 is described below

commit 64f30f3d8f9fa1ccf9c0f843b3a23a4091ec8ae4
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Dec 27 14:17:09 2024 +0800

    branch-3.0: [fix](clone) Fix the skipped link file due to the stale value 
#46009 (#46067)
    
    Cherry-picked from #46009
    
    Co-authored-by: walter <maoch...@selectdb.com>
---
 be/src/olap/task/engine_clone_task.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/be/src/olap/task/engine_clone_task.cpp 
b/be/src/olap/task/engine_clone_task.cpp
index 9af3e078d3a..ecf1bdfc6d5 100644
--- a/be/src/olap/task/engine_clone_task.cpp
+++ b/be/src/olap/task/engine_clone_task.cpp
@@ -813,8 +813,6 @@ Status EngineCloneTask::_finish_clone(Tablet* tablet, const 
std::string& clone_d
     /// Traverse all downloaded clone files in CLONE dir.
     /// If it does not exist in local tablet dir, link the file to local 
tablet dir
     /// And save all linked files in linked_success_files.
-    /// if binlog exist in clone dir and md5sum equal, then skip link file
-    bool skip_link_file = false;
     for (const string& clone_file : clone_file_names) {
         if (local_file_names.find(clone_file) != local_file_names.end()) {
             VLOG_NOTICE << "find same file when clone, skip it. "
@@ -822,6 +820,8 @@ Status EngineCloneTask::_finish_clone(Tablet* tablet, const 
std::string& clone_d
             continue;
         }
 
+        /// if binlog exist in clone dir and md5sum equal, then skip link file
+        bool skip_link_file = false;
         std::string to;
         if (clone_file.ends_with(".binlog") || 
clone_file.ends_with(".binlog-index")) {
             if (!contain_binlog) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to