From 7d521ce288f8a19d7690ffd8deb433992a198d69 Mon Sep 17 00:00:00 2001 From: walter Date: Fri, 14 Mar 2025 11:18:51 +0800 Subject: [PATCH] =?UTF-8?q?branch-2.1:=20[fix](binlog)=20avoid=20adding=20?= =?UTF-8?q?acqurie=5Fmd5=20param=20when=20enable=5Fdownload=5Fmd5=E2=80=A6?= =?UTF-8?q?=20#48573=20(#49004)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cherry pick from #48573 --- be/src/service/backend_service.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/be/src/service/backend_service.cpp b/be/src/service/backend_service.cpp index 9c8080ddaa..a6a5ba898a 100644 --- a/be/src/service/backend_service.cpp +++ b/be/src/service/backend_service.cpp @@ -290,8 +290,10 @@ void _ingest_binlog(IngestBinlogArg* arg) { // Step 5.3: get all segment files for (int64_t segment_index = 0; segment_index < num_segments; ++segment_index) { auto segment_file_size = segment_file_sizes[segment_index]; - auto get_segment_file_url = - fmt::format("{}&acquire_md5=true", segment_file_urls[segment_index]); + auto get_segment_file_url = segment_file_urls[segment_index]; + if (config::enable_download_md5sum_check) { + get_segment_file_url = fmt::format("{}&acquire_md5=true", get_segment_file_url); + } auto local_segment_path = BetaRowset::segment_file_path( local_tablet->tablet_path(), rowset_meta->rowset_id(), segment_index); @@ -306,9 +308,7 @@ void _ingest_binlog(IngestBinlogArg* arg) { download_success_files.push_back(local_segment_path); std::string remote_file_md5; - if (config::enable_download_md5sum_check) { - RETURN_IF_ERROR(client->get_content_md5(&remote_file_md5)); - } + RETURN_IF_ERROR(client->get_content_md5(&remote_file_md5)); LOG(INFO) << "download segment file to " << local_segment_path << ", remote md5: " << remote_file_md5 << ", remote size: " << segment_file_size; @@ -463,8 +463,11 @@ void _ingest_binlog(IngestBinlogArg* arg) { DCHECK(segment_index_file_names.size() == segment_index_file_urls.size()); for (int64_t i = 0; i < segment_index_file_urls.size(); ++i) { auto segment_index_file_size = segment_index_file_sizes[i]; - auto get_segment_index_file_url = - fmt::format("{}&acquire_md5=true", segment_index_file_urls[i]); + auto get_segment_index_file_url = segment_index_file_urls[i]; + if (config::enable_download_md5sum_check) { + get_segment_index_file_url = + fmt::format("{}&acquire_md5=true", get_segment_index_file_url); + } uint64_t estimate_timeout = estimate_download_timeout(segment_index_file_size); auto local_segment_index_path = segment_index_file_names[i]; @@ -479,9 +482,7 @@ void _ingest_binlog(IngestBinlogArg* arg) { download_success_files.push_back(local_segment_index_path); std::string remote_file_md5; - if (config::enable_download_md5sum_check) { - RETURN_IF_ERROR(client->get_content_md5(&remote_file_md5)); - } + RETURN_IF_ERROR(client->get_content_md5(&remote_file_md5)); std::error_code ec; // Check file length