Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/DorisFE.java
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ public static void start(String dorisHomeDir, String pidDir, String[] args, Star
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");
Expand Down Expand Up @@ -485,6 +487,13 @@ private static void releaseFileLockAndCloseFileChannel() {

}

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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public AddPartitionRecord(long commitSeq, PartitionPersistInfo partitionPersistI
sb.append(")");
}
sb.append("(\"version_info\" = \"");
sb.append(partition.getCachedVisibleVersion()).append("\"");
sb.append(partition.getVisibleVersion()).append("\"");
sb.append(");");
this.sql = sb.toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,6 @@ public void updateVisibleVersionAndTime(long visibleVersion, long visibleVersion
this.setVisibleVersionAndTime(visibleVersion, visibleVersionTime);
}

public long getCachedVisibleVersion() {
return visibleVersion;
}

public long getVisibleVersion() {
return visibleVersion;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,6 @@ public void setCachedVisibleVersion(long version) {
lock.unlock();
}

@Override
public long getCachedVisibleVersion() {
return super.getVisibleVersion();
}

@Override
public long getVisibleVersion() {
if (LOG.isDebugEnabled()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down