This is an automated email from the ASF dual-hosted git repository.
luozenglin pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 475c03709d3 [fix](meta) fix follower sync image timeout after
checkpoint. (#26003) (#26276)
475c03709d3 is described below
commit 475c03709d33e56e02fbcb6c316e577857a71432
Author: luozenglin <luozeng...@baidu.com>
AuthorDate: Thu Nov 2 11:16:58 2023 +0800
[fix](meta) fix follower sync image timeout after checkpoint. (#26003)
(#26276)
---
fe/fe-common/src/main/java/org/apache/doris/common/Config.java | 10 +++++-----
.../main/java/org/apache/doris/httpv2/meta/MetaService.java | 4 +---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
index ce90a0c1dda..06a3911c1f8 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
@@ -2212,11 +2212,11 @@ public class Config extends ConfigBase {
public static boolean ignore_unknown_metadata_module = false;
@ConfField(mutable = true, masterOnly = true, description = {
-
"FE扩容时，从主节点同步元数据的timeout时间，根据${meta_dir}/image文件夹下面的image文件大小和节点间的网络环境调整，"
- + "单位为秒，默认值300",
- "The timeout for new FE Follower/Observer synchronizing metadata from
the FE Master, "
- + "adjust by the size of image file in the ${meta_dir}/image and
the network environment between nodes. "
- + "The default values is 300s."
+
"从主节点同步image文件的超时时间，用户可根据${meta_dir}/image文件夹下面的image文件大小和节点间的网络环境调整，"
+ + "单位为秒，默认值300",
+ "The timeout for FE Follower/Observer synchronizing an image file
from the FE Master, can be adjusted by "
+ + "the user on the size of image file in the
${meta_dir}/image and the network environment between "
+ + "nodes. The default values is 300."
})
public static int sync_image_timeout_second = 300;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java
index ce71581f5c2..65a3ac8d2e5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java
@@ -49,8 +49,6 @@ import javax.servlet.http.HttpServletResponse;
public class MetaService extends RestBaseController {
private static final Logger LOG = LogManager.getLogger(MetaService.class);
- private static final int TIMEOUT_SECOND = 10;
-
private static final String VERSION = "version";
private static final String HOST = "host";
private static final String PORT = "port";
@@ -162,7 +160,7 @@ public class MetaService extends RestBaseController {
String filename = Storage.IMAGE + "." + versionStr;
File dir = new File(Env.getCurrentEnv().getImageDir());
try {
- MetaHelper.getRemoteFile(url, TIMEOUT_SECOND * 1000,
MetaHelper.getFile(filename, dir));
+ MetaHelper.getRemoteFile(url, Config.sync_image_timeout_second *
1000, MetaHelper.getFile(filename, dir));
MetaHelper.complete(filename, dir);
} catch (FileNotFoundException e) {
return ResponseEntityBuilder.notFound("file not found.");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
