[improvement](deploy) Forbid LocalDeployManager drop node

apache · Sep 4, 2023 · 988e618 · 988e618
1 parent 7727535
commit 988e618
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/docs/en/docs/admin-manual/config/fe-config.md b/docs/en/docs/admin-manual/config/fe-config.md
@@ -2768,3 +2768,8 @@ Default：true
 
 Temporary configuration option. After it is enabled, a background thread will be started to automatically modify all olap tables to light schema change. The modification results can be viewed through the command `show convert_light_schema_change [from db]`, and the conversion results of all non-light schema change tables will be displayed.
 
+#### `disable_local_deploy_manager_drop_node`
+
+Default：true
+
+Forbid LocalDeployManager drop nodes to prevent errors in the cluster.info file from causing nodes to be dropped.
diff --git a/docs/zh-CN/docs/admin-manual/config/fe-config.md b/docs/zh-CN/docs/admin-manual/config/fe-config.md
@@ -2769,4 +2769,10 @@ show data （其他用法：HELP SHOW DATA）
 
 默认值：true
 
-暂时性配置项，开启后会启动后台线程自动将所有的olap表修改为可light schema change，修改结果可通过命令`show convert_light_schema_change [from db]` 来查看，将会展示所有非light schema change表的转换结果
+暂时性配置项，开启后会启动后台线程自动将所有的olap表修改为可light schema change，修改结果可通过命令`show convert_light_schema_change [from db]` 来查看，将会展示所有非light schema change表的转换结果
+
+#### `disable_local_deploy_manager_drop_node`
+
+默认值：true
+
+禁止LocalDeployManager删除节点，防止cluster.info文件有误导致节点被删除。
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
@@ -1,4 +1,5 @@
 // Licensed to the Apache Software Foundation (ASF) under one
+// Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
 // regarding copyright ownership.  The ASF licenses this file
@@ -2153,4 +2154,8 @@ public class Config extends ConfigBase {
     })
     public static long query_metadata_name_ids_timeout = 3;
 
+    @ConfField(mutable = true, masterOnly = true, description = {
+            "是否禁止LocalDeployManager删除节点",
+            "Whether to disable LocalDeployManager drop node"})
+    public static boolean disable_local_deploy_manager_drop_node = true;
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/deploy/DeployManager.java b/fe/fe-core/src/main/java/org/apache/doris/deploy/DeployManager.java
@@ -25,6 +25,7 @@
 import org.apache.doris.common.Pair;
 import org.apache.doris.common.UserException;
 import org.apache.doris.common.util.MasterDaemon;
+import org.apache.doris.deploy.impl.LocalFileDeployManager;
 import org.apache.doris.ha.FrontendNodeType;
 import org.apache.doris.system.Backend;
 import org.apache.doris.system.Frontend;
@@ -480,6 +481,10 @@ private void inspectNodeChange(List<HostInfo> remoteHostInfos,
             HostInfo foundHostInfo = getFromHostInfos(remoteHostInfos, localHostInfo);
             boolean needDrop = needDrop(foundHostInfo != null, localHostInfo);
             if (needDrop) {
+                if (this instanceof LocalFileDeployManager && Config.disable_local_deploy_manager_drop_node) {
+                    LOG.warn("For now, Local File Deploy Manager dose not handle shrinking operations");
+                    continue;
+                }
                 dealDropLocal(localHostInfo, nodeType);
             }
         }