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 9fcc397ff0a branch-3.1: [improve](iceberg rest) Add a default network 
connection timeout to Iceberg REST #58395 (#58434)
9fcc397ff0a is described below

commit 9fcc397ff0a73b76a1fa8338957663822980f657
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Dec 1 15:51:55 2025 +0800

    branch-3.1: [improve](iceberg rest) Add a default network connection 
timeout to Iceberg REST #58395 (#58434)
    
    Cherry-picked from #58395
    
    Co-authored-by: zy-kkk <[email protected]>
---
 .../property/metastore/IcebergRestProperties.java       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/IcebergRestProperties.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/IcebergRestProperties.java
index fda6cd52300..982c7864324 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/IcebergRestProperties.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/IcebergRestProperties.java
@@ -152,6 +152,16 @@ public class IcebergRestProperties extends 
AbstractIcebergProperties {
             description = "The secret access key for the iceberg rest catalog 
service.")
     private String icebergRestSecretAccessKey = "";
 
+    @ConnectorProperty(names = {"iceberg.rest.connection-timeout-ms"},
+            required = false,
+            description = "Connection timeout in milliseconds for the REST 
catalog HTTP client. Default: 10000 (10s).")
+    private String icebergRestConnectionTimeoutMs = "10000";
+
+    @ConnectorProperty(names = {"iceberg.rest.socket-timeout-ms"},
+            required = false,
+            description = "Socket timeout in milliseconds for the REST catalog 
HTTP client. Default: 60000 (60s).")
+    private String icebergRestSocketTimeoutMs = "60000";
+
     protected IcebergRestProperties(Map<String, String> props) {
         super(props);
     }
@@ -258,6 +268,13 @@ public class IcebergRestProperties extends 
AbstractIcebergProperties {
         if (isIcebergRestVendedCredentialsEnabled()) {
             icebergRestCatalogProperties.put(VENDED_CREDENTIALS_HEADER, 
VENDED_CREDENTIALS_VALUE);
         }
+
+        if (Strings.isNotBlank(icebergRestConnectionTimeoutMs)) {
+            
icebergRestCatalogProperties.put("rest.client.connection-timeout-ms", 
icebergRestConnectionTimeoutMs);
+        }
+        if (Strings.isNotBlank(icebergRestSocketTimeoutMs)) {
+            icebergRestCatalogProperties.put("rest.client.socket-timeout-ms", 
icebergRestSocketTimeoutMs);
+        }
     }
 
     private void addAuthenticationProperties() {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to