This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new a501a6c6cdb branch-4.1: [fix](fe) add --drop_backends param to
start_fe.sh (#63306) (#63515)
a501a6c6cdb is described below
commit a501a6c6cdb9a4825d406ebbe82d041365f4e481
Author: meiyi <[email protected]>
AuthorDate: Fri May 22 23:37:24 2026 +0800
branch-4.1: [fix](fe) add --drop_backends param to start_fe.sh (#63306)
(#63515)
pick https://github.com/apache/doris/pull/63306
---
bin/start_fe.sh | 14 +++++++++----
docker/runtime/doris-compose/resource/init_fe.sh | 2 +-
.../src/main/java/org/apache/doris/DorisFE.java | 5 +++++
.../main/java/org/apache/doris/catalog/Env.java | 23 ++++++++++++++++++++++
.../java/org/apache/doris/common/FeConstants.java | 1 +
5 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/bin/start_fe.sh b/bin/start_fe.sh
index 45b883ef1c5..941e8c5a52d 100755
--- a/bin/start_fe.sh
+++ b/bin/start_fe.sh
@@ -36,6 +36,7 @@ OPTS="$(getopt \
-l 'recovery_journal_id:' \
-l 'console' \
-l 'cluster_snapshot:' \
+ -l 'drop_backends' \
-- "$@")"
eval set -- "${OPTS}"
@@ -50,6 +51,7 @@ declare -a HELPER_ARGS=()
declare -a METADATA_FAILURE_RECOVERY_ARGS=()
declare -a RECOVERY_JOURNAL_ID_ARGS=()
declare -a CLUSTER_SNAPSHOT_ARGS=()
+declare -a DROP_BACKENDS_ARGS=()
while true; do
case "$1" in
--daemon)
@@ -85,6 +87,10 @@ while true; do
CLUSTER_SNAPSHOT_ARGS=("--cluster_snapshot" "$2")
shift 2
;;
+ --drop_backends)
+ DROP_BACKENDS_ARGS=("--drop_backends")
+ shift
+ ;;
--)
shift
break
@@ -93,7 +99,7 @@ while true; do
echo "Internal error"
exit 1
;;
- esac
+esac
done
DORIS_HOME="$(
@@ -433,12 +439,12 @@ if [[ "${IMAGE_TOOL}" -eq 1 ]]; then
echo "Internal error, USE IMAGE_TOOL like: ./start_fe.sh --image
image_path"
fi
elif [[ "${RUN_DAEMON}" -eq 1 ]]; then
- nohup ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}}
-XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p"
${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE "${HELPER_ARGS[@]}"
"${METADATA_FAILURE_RECOVERY_ARGS[@]}" "${RECOVERY_JOURNAL_ID_ARGS[@]}"
"${CLUSTER_SNAPSHOT_ARGS[@]}" "$@" >>"${STDOUT_LOGGER}" 2>&1 </dev/null &
+ nohup ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}}
-XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p"
${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE "${HELPER_ARGS[@]}"
"${METADATA_FAILURE_RECOVERY_ARGS[@]}" "${RECOVERY_JOURNAL_ID_ARGS[@]}"
"${CLUSTER_SNAPSHOT_ARGS[@]}" "${DROP_BACKENDS_ARGS[@]}" "$@"
>>"${STDOUT_LOGGER}" 2>&1 </dev/null &
elif [[ "${RUN_CONSOLE}" -eq 1 ]]; then
export DORIS_LOG_TO_STDERR=1
- ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}}
-XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p"
${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE "${HELPER_ARGS[@]}"
${OPT_VERSION:+${OPT_VERSION}} "${METADATA_FAILURE_RECOVERY_ARGS[@]}"
"${RECOVERY_JOURNAL_ID_ARGS[@]}" "${CLUSTER_SNAPSHOT_ARGS[@]}" "$@"
>>"${STDOUT_LOGGER}" </dev/null
+ ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}}
-XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p"
${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE "${HELPER_ARGS[@]}"
${OPT_VERSION:+${OPT_VERSION}} "${METADATA_FAILURE_RECOVERY_ARGS[@]}"
"${RECOVERY_JOURNAL_ID_ARGS[@]}" "${CLUSTER_SNAPSHOT_ARGS[@]}"
"${DROP_BACKENDS_ARGS[@]}" "$@" >>"${STDOUT_LOGGER}" </dev/null
else
- ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}}
-XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p"
${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE "${HELPER_ARGS[@]}"
${OPT_VERSION:+${OPT_VERSION}} "${METADATA_FAILURE_RECOVERY_ARGS[@]}"
"${RECOVERY_JOURNAL_ID_ARGS[@]}" "${CLUSTER_SNAPSHOT_ARGS[@]}" "$@"
>>"${STDOUT_LOGGER}" 2>&1 </dev/null
+ ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}}
-XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p"
${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE "${HELPER_ARGS[@]}"
${OPT_VERSION:+${OPT_VERSION}} "${METADATA_FAILURE_RECOVERY_ARGS[@]}"
"${RECOVERY_JOURNAL_ID_ARGS[@]}" "${CLUSTER_SNAPSHOT_ARGS[@]}"
"${DROP_BACKENDS_ARGS[@]}" "$@" >>"${STDOUT_LOGGER}" 2>&1 </dev/null
fi
if [[ "${OPT_VERSION}" != "" ]]; then
diff --git a/docker/runtime/doris-compose/resource/init_fe.sh
b/docker/runtime/doris-compose/resource/init_fe.sh
index 051711c8004..719f85f27eb 100755
--- a/docker/runtime/doris-compose/resource/init_fe.sh
+++ b/docker/runtime/doris-compose/resource/init_fe.sh
@@ -119,7 +119,7 @@ start_cloud_fe() {
exit $MV_RES
fi
health_log "Recovery script executed and renamed to
${RECOVERY_SCRIPT}.bak"
- RECOVERY_ARGS="--metadata_failure_recovery --recovery_journal_id
$JOURNAL_ID"
+ RECOVERY_ARGS="--metadata_failure_recovery --recovery_journal_id
$JOURNAL_ID --drop_backends"
fi
if [ -f "$REGISTER_FILE" ] || [ -n "$RECOVERY_ARGS" ]; then
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 54819c5afc2..0b6dd5761e5 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
@@ -362,6 +362,8 @@ public class DorisFE {
.desc("Specify the recovery truncate journal id, and journals
greater than this id will be removed")
.build());
options.addOption("c", "cluster_snapshot", true, "Specify the cluster
snapshot json file");
+
options.addOption(Option.builder().longOpt(FeConstants.DROP_BACKENDS_KEY)
+ .desc("When this FE becomes MASTER, drop all backends from
cluster metadata (destructive)").build());
CommandLine cmd = null;
try {
@@ -406,6 +408,9 @@ public class DorisFE {
}
System.setProperty(FeConstants.RECOVERY_JOURNAL_ID_KEY,
recoveryJournalId.trim());
}
+ if (cmd.hasOption(FeConstants.DROP_BACKENDS_KEY)) {
+ System.setProperty(FeConstants.DROP_BACKENDS_KEY, "true");
+ }
if (cmd.hasOption('b') || cmd.hasOption("bdb")) {
if (cmd.hasOption('l') || cmd.hasOption("listdb")) {
// list bdb je databases
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
index 0e8ffce40b4..67a1d656051 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
@@ -55,6 +55,7 @@ import org.apache.doris.clone.DynamicPartitionScheduler;
import org.apache.doris.clone.TabletChecker;
import org.apache.doris.clone.TabletScheduler;
import org.apache.doris.clone.TabletSchedulerStat;
+import org.apache.doris.cloud.system.CloudSystemInfoService;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.Config;
import org.apache.doris.common.ConfigBase;
@@ -261,6 +262,7 @@ import org.apache.doris.statistics.StatisticsCleaner;
import org.apache.doris.statistics.StatisticsJobAppender;
import org.apache.doris.statistics.StatisticsMetricCollector;
import org.apache.doris.statistics.query.QueryStats;
+import org.apache.doris.system.Backend;
import org.apache.doris.system.Frontend;
import org.apache.doris.system.HeartbeatMgr;
import org.apache.doris.system.SystemInfoService;
@@ -316,6 +318,7 @@ import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@@ -1769,6 +1772,26 @@ public class Env {
editLog.logMasterInfo(masterInfo);
LOG.info("logMasterInfo:{}", masterInfo);
+ if (Boolean.getBoolean(FeConstants.DROP_BACKENDS_KEY)) {
+ LOG.info("drop_backends is set, dropping all backends...");
+ try {
+ SystemInfoService systemInfoService =
Env.getCurrentSystemInfo();
+ List<Backend> bes =
systemInfoService.getAllClusterBackendsNoException().values()
+ .stream().collect(Collectors.toList());
+ if (Config.isNotCloudMode()) {
+ for (Backend be : bes) {
+ systemInfoService.dropBackend(be.getHost(),
be.getHeartbeatPort());
+ }
+ } else {
+ ((CloudSystemInfoService)
systemInfoService).updateCloudBackends(Collections.emptyList(), bes);
+ }
+ } catch (Exception e) {
+ LOG.warn("failed to drop backends", e);
+ }
+ System.clearProperty(FeConstants.DROP_BACKENDS_KEY);
+ LOG.info("finished dropping all backends");
+ }
+
// for master, the 'isReady' is set behind.
// but we are sure that all metadata is replayed if we get here.
// so no need to check 'isReady' flag in this method
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/FeConstants.java
b/fe/fe-core/src/main/java/org/apache/doris/common/FeConstants.java
index dc2e2aafbdc..8d05fd2a698 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/FeConstants.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/FeConstants.java
@@ -68,4 +68,5 @@ public class FeConstants {
public static String METADATA_FAILURE_RECOVERY_KEY =
"metadata_failure_recovery";
public static String RECOVERY_JOURNAL_ID_KEY = "recovery_journal_id";
+ public static String DROP_BACKENDS_KEY = "drop_backends";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
