This is an automated email from the ASF dual-hosted git repository. dataroaring pushed a commit to branch branch-4.0-preview in repository https://gitbox.apache.org/repos/asf/doris.git
commit bc8de9803280bf89b7ee51b439748de62c92a821 Author: walter <[email protected]> AuthorDate: Thu Apr 18 12:10:01 2024 +0800 [fix](cloud) Disable enable_feature_binlog in the cloud mode (#33719) --- fe/fe-core/src/main/java/org/apache/doris/DorisFE.java | 9 +++++++++ .../main/java/org/apache/doris/binlog/AddPartitionRecord.java | 2 +- fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java | 4 ---- .../main/java/org/apache/doris/cloud/catalog/CloudPartition.java | 5 ----- .../pipeline/cloud_p0/conf/regression-conf-custom.groovy | 2 ++ .../pipeline/cloud_p1/conf/regression-conf-custom.groovy | 2 ++ 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/DorisFE.java b/fe/fe-core/src/main/java/org/apache/doris/DorisFE.java index dfadde6626c..696634fed34 100755 --- a/fe/fe-core/src/main/java/org/apache/doris/DorisFE.java +++ b/fe/fe-core/src/main/java/org/apache/doris/DorisFE.java @@ -129,6 +129,8 @@ public class DorisFE { ldapConfig.init(dorisHomeDir + "/conf/ldap.conf"); } + overwriteConfigs(); + // check it after Config is initialized, otherwise the config 'check_java_version' won't work. if (!JdkUtils.checkJavaVersion()) { throw new IllegalArgumentException("Java version doesn't match"); @@ -485,6 +487,13 @@ public class DorisFE { } + public static void overwriteConfigs() { + if (Config.isCloudMode() && Config.enable_feature_binlog) { + Config.enable_feature_binlog = false; + LOG.warn("Force set enable_feature_binlog=false because it is not supported in the cloud mode yet"); + } + } + public static class StartupOptions { public boolean enableHttpServer = true; public boolean enableQeService = true; diff --git a/fe/fe-core/src/main/java/org/apache/doris/binlog/AddPartitionRecord.java b/fe/fe-core/src/main/java/org/apache/doris/binlog/AddPartitionRecord.java index cd872bec1bc..9bc5ff7da0f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/binlog/AddPartitionRecord.java +++ b/fe/fe-core/src/main/java/org/apache/doris/binlog/AddPartitionRecord.java @@ -84,7 +84,7 @@ public class AddPartitionRecord { sb.append(")"); } sb.append("(\"version_info\" = \""); - sb.append(partition.getCachedVisibleVersion()).append("\""); + sb.append(partition.getVisibleVersion()).append("\""); sb.append(");"); this.sql = sb.toString(); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java index a41502e395f..1c9ec4e49a3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Partition.java @@ -161,10 +161,6 @@ public class Partition extends MetaObject implements Writable { this.setVisibleVersionAndTime(visibleVersion, visibleVersionTime); } - public long getCachedVisibleVersion() { - return visibleVersion; - } - public long getVisibleVersion() { return visibleVersion; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudPartition.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudPartition.java index 0f613b6c442..6336be08ee4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudPartition.java +++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudPartition.java @@ -100,11 +100,6 @@ public class CloudPartition extends Partition { lock.unlock(); } - @Override - public long getCachedVisibleVersion() { - return super.getVisibleVersion(); - } - @Override public long getVisibleVersion() { if (LOG.isDebugEnabled()) { diff --git a/regression-test/pipeline/cloud_p0/conf/regression-conf-custom.groovy b/regression-test/pipeline/cloud_p0/conf/regression-conf-custom.groovy index 544f7238b66..d7e02406196 100644 --- a/regression-test/pipeline/cloud_p0/conf/regression-conf-custom.groovy +++ b/regression-test/pipeline/cloud_p0/conf/regression-conf-custom.groovy @@ -55,6 +55,8 @@ excludeDirectories = "000_the_start_sentinel_do_not_touch," + // keep this line "backup_restore," + // not a case for cloud mode, no need to run "cold_heat_separation," + "storage_medium_p0," + + "ccr_syncer_p0," + + "ccr_mow_syncer_p0," + "zzz_the_end_sentinel_do_not_touch" // keep this line as the last line max_failure_num = 100 diff --git a/regression-test/pipeline/cloud_p1/conf/regression-conf-custom.groovy b/regression-test/pipeline/cloud_p1/conf/regression-conf-custom.groovy index ee741731239..111e3f8546b 100644 --- a/regression-test/pipeline/cloud_p1/conf/regression-conf-custom.groovy +++ b/regression-test/pipeline/cloud_p1/conf/regression-conf-custom.groovy @@ -14,6 +14,8 @@ excludeDirectories = "000_the_start_sentinel_do_not_touch," + // keep this line "backup_restore," + "fault_injection_p0," + "workload_manager_p1," + + "ccr_syncer_p1," + + "ccr_mow_syncer_p1," + "zzz_the_end_sentinel_do_not_touch" // keep this line as the last line max_failure_num = 50 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
