Merge branch 'branch-3.1' into fix-coredump-mv-31

xy720 · web-flow · commit 975c0ee8d955 · 2025-11-18T12:23:58.000+08:00
diff --git a/be/src/io/cache/cached_remote_file_reader.cpp b/be/src/io/cache/cached_remote_file_reader.cpp
@@ -258,7 +258,8 @@ Status CachedRemoteFileReader::_execute_remote_read(const std::vector<FileBlockS
         }
     });
 
-    if (!_is_doris_table || io_ctx->is_warmup || !doris::config::enable_cache_read_from_peer) {
+    if (!doris::config::is_cloud_mode() || !_is_doris_table || io_ctx->is_warmup ||
+        !doris::config::enable_cache_read_from_peer) {
         return execute_s3_read(empty_start, size, buffer, stats, io_ctx, _remote_file_reader);
     } else {
         // first try peer read, if peer failed, fallback to S3

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,8 @@ Status CachedRemoteFileReader::_execute_remote_read(const std::vector<FileBlockS`
`258`	`258`	`}`
`259`	`259`	`});`
`260`	`260`
`261`		`- if (!_is_doris_table \|\| io_ctx->is_warmup \|\| !doris::config::enable_cache_read_from_peer) {`
	`261`	`+ if (!doris::config::is_cloud_mode() \|\| !_is_doris_table \|\| io_ctx->is_warmup \|\|`
	`262`	`+ !doris::config::enable_cache_read_from_peer) {`
`262`	`263`	`return execute_s3_read(empty_start, size, buffer, stats, io_ctx, _remote_file_reader);`
`263`	`264`	`} else {`
`264`	`265`	`// first try peer read, if peer failed, fallback to S3`