This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new b02ee1905c1 [improve](fe) Improve checking compatibility mode (#36310)
b02ee1905c1 is described below
commit b02ee1905c1bab9b8d4748bb38d5844e12b6f372
Author: walter <w41te...@gmail.com>
AuthorDate: Sat Jun 15 09:22:23 2024 +0800
[improve](fe) Improve checking compatibility mode (#36310)
1. Reset bdbje group to avoid infinite blocking
2. Skip port available checking
---
fe/fe-core/src/main/java/org/apache/doris/DorisFE.java | 5 +++++
.../src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java | 4 ++--
2 files changed, 7 insertions(+), 2 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 3ca39bbfd06..556e4d1364f 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
@@ -227,6 +227,11 @@ public class DorisFE {
}
private static void checkAllPorts() throws IOException {
+ if (Config.enable_check_compatibility_mode) {
+ // The compatibility mode does not need to listen ports.
+ return;
+ }
+
if (!NetUtils.isPortAvailable(FrontendOptions.getLocalHostAddress(),
Config.edit_log_port,
"Edit log port", NetUtils.EDIT_LOG_PORT_SUGGESTION)) {
throw new IOException("port " + Config.edit_log_port + " already
in use");
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java
b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java
index d2784a05e70..ff162b0c9fa 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java
@@ -96,8 +96,8 @@ public class BDBEnvironment {
public void setup(File envHome, String selfNodeName, String
selfNodeHostPort,
String helperHostPort) {
// Almost never used, just in case the master can not restart
- if (metadataFailureRecovery) {
- if (!isElectable) {
+ if (metadataFailureRecovery || Config.enable_check_compatibility_mode)
{
+ if (!isElectable && !Config.enable_check_compatibility_mode) {
LOG.error("Current node is not in the electable_nodes list.
will exit");
System.exit(-1);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
