(doris) branch branch-4.0 updated: branch-4.0: [fix](iceberg) disable default iceberg manifest cache and update test configurations #60027 (#60039)

[yiguolei]

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

yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-4.0 by this push:
     new 4f87dc4eb30 branch-4.0: [fix](iceberg) disable default iceberg 
manifest cache and update test configurations #60027 (#60039)
4f87dc4eb30 is described below

commit 4f87dc4eb302c11dc554b728d6f872686b1160c6
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jan 20 14:44:45 2026 +0800

    branch-4.0: [fix](iceberg) disable default iceberg manifest cache and 
update test configurations #60027 (#60039)
    
    Cherry-picked from #60027
    
    Co-authored-by: Socrates <suyit...@selectdb.com>
---
 .../doris/datasource/iceberg/IcebergExternalCatalog.java      |  2 +-
 .../iceberg/test_iceberg_table_meta_cache.groovy              | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalCatalog.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalCatalog.java
index 76cd2776ab2..4d371fe6c64 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalCatalog.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalCatalog.java
@@ -57,7 +57,7 @@ public abstract class IcebergExternalCatalog extends 
ExternalCatalog {
     public static final String ICEBERG_MANIFEST_CACHE_ENABLE = 
"iceberg.manifest.cache.enable";
     public static final String ICEBERG_MANIFEST_CACHE_CAPACITY_MB = 
"iceberg.manifest.cache.capacity-mb";
     public static final String ICEBERG_MANIFEST_CACHE_TTL_SECOND = 
"iceberg.manifest.cache.ttl-second";
-    public static final boolean DEFAULT_ICEBERG_MANIFEST_CACHE_ENABLE = true;
+    public static final boolean DEFAULT_ICEBERG_MANIFEST_CACHE_ENABLE = false;
     public static final long DEFAULT_ICEBERG_MANIFEST_CACHE_CAPACITY_MB = 1024;
     public static final long DEFAULT_ICEBERG_MANIFEST_CACHE_TTL_SECOND = 48 * 
60 * 60;
     protected String icebergCatalogType;
diff --git 
a/regression-test/suites/external_table_p0/iceberg/test_iceberg_table_meta_cache.groovy
 
b/regression-test/suites/external_table_p0/iceberg/test_iceberg_table_meta_cache.groovy
index fa0142089a1..0f3391805b0 100644
--- 
a/regression-test/suites/external_table_p0/iceberg/test_iceberg_table_meta_cache.groovy
+++ 
b/regression-test/suites/external_table_p0/iceberg/test_iceberg_table_meta_cache.groovy
@@ -21,7 +21,7 @@ suite("test_iceberg_table_meta_cache", 
"p0,external,doris,external_docker,extern
 
     String enabled = context.config.otherConfigs.get("enableIcebergTest")
     if (enabled != null && enabled.equalsIgnoreCase("true")) {
-        for (String hivePrefix : ["hive2"]) {
+        for (String hivePrefix : ["hive3"]) {
             String externalEnvIp = 
context.config.otherConfigs.get("externalEnvIp")
             String hmsPort = context.config.otherConfigs.get(hivePrefix + 
"HmsPort")
             String hdfs_port = context.config.otherConfigs.get(hivePrefix + 
"HdfsPort")
@@ -36,7 +36,8 @@ suite("test_iceberg_table_meta_cache", 
"p0,external,doris,external_docker,extern
                 'iceberg.catalog.type'='hms',
                 'hive.metastore.uris' = 'thrift://${externalEnvIp}:${hmsPort}',
                 'fs.defaultFS' = '${default_fs}',
-                'warehouse' = '${warehouse}'
+                'warehouse' = '${warehouse}',
+                'iceberg.manifest.cache.enable' = 'true'
             );
             """
             sql """switch ${catalog_name}"""
@@ -74,6 +75,7 @@ suite("test_iceberg_table_meta_cache", 
"p0,external,doris,external_docker,extern
                     'hive.metastore.uris' = 
'thrift://${externalEnvIp}:${hmsPort}',
                     'fs.defaultFS' = '${default_fs}',
                     'warehouse' = '${warehouse}',
+                    'iceberg.manifest.cache.enable' = 'false',
                     'iceberg.table.meta.cache.ttl-second' = '-2'
                 );
                 """
@@ -88,6 +90,7 @@ suite("test_iceberg_table_meta_cache", 
"p0,external,doris,external_docker,extern
                 'hive.metastore.uris' = 'thrift://${externalEnvIp}:${hmsPort}',
                 'fs.defaultFS' = '${default_fs}',
                 'warehouse' = '${warehouse}',
+                'iceberg.manifest.cache.enable' = 'false',
                 'iceberg.table.meta.cache.ttl-second' = '0'
             );
             """
@@ -122,7 +125,8 @@ suite("test_iceberg_table_meta_cache", 
"p0,external,doris,external_docker,extern
                 'iceberg.catalog.type'='hms',
                 'hive.metastore.uris' = 'thrift://${externalEnvIp}:${hmsPort}',
                 'fs.defaultFS' = '${default_fs}',
-                'warehouse' = '${warehouse}'
+                'warehouse' = '${warehouse}',
+                'iceberg.manifest.cache.enable' = 'false'
             );
             """
             sql """switch ${catalog_name_no_cache}"""
@@ -165,4 +169,3 @@ suite("test_iceberg_table_meta_cache", 
"p0,external,doris,external_docker,extern
         }
     }
 }
-


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