Merge remote-tracking branch 'upstream/v1.5.0' into feat/mongodb_mcp/TencentBlueKing#16073

Author: cycker

.gitignore

@@ -8,7 +8,7 @@
 pre-*-bkcodeai
 .vscode
 .python-version
-
+**/CODE_REVIEW_SUGGESTIONS.md
 bkcodeai.json
 package-lock.json
 *.swp

dbm-services/bigdata/db-tools/dbactuator/pkg/components/doris/init_system_config.go

@@ -109,7 +109,7 @@ func (i *InitSystemConfigService) WriteProfile() (err error) {
 	scripts := []byte(`cat << 'EOF' > /data/dorisenv/dorisprofile
 export JAVA_HOME=/data/dorisenv/java/jdk
 export JRE=$JAVA_HOME/jre
-export PATH=$JAVA_HOME/bin:$JRE_HOME/bin:$PATH
+export PATH=/usr/local/bin:$JAVA_HOME/bin:$JRE_HOME/bin:$PATH
 export CLASSPATH=".:$JAVA_HOME/lib:$JRE/lib:$CLASSPATH"
 export LC_ALL=en_US
 export DORIS_HOME=/data/dorisenv/` + i.Params.Role + `

dbm-services/bigdata/db-tools/dbactuator/pkg/components/elasticsearch/install_elasticsearch.go

@@ -179,7 +179,7 @@ export JAVA_HOME=/data/esenv/es_1/jdk
 export CLASSPATH=".:$JAVA_HOME/lib:$JRE/lib:$CLASSPATH"
 export ES_HOME=/data/esenv/es_1
 export ES_CONF_DIR=$ES_HOME/config
-export PATH=${JAVA_HOME}/bin:${ES_HOME}/bin:${ES_HOME}/sbin:$PATH
+export PATH=/usr/local/bin:${JAVA_HOME}/bin:${ES_HOME}/bin:${ES_HOME}/sbin:$PATH
 export ES_USERNAME=%s
 export ES_PASSWORD=%s
 EOF

dbm-services/bigdata/db-tools/dbactuator/pkg/components/hdfs/init_system_config.go

@@ -2,7 +2,7 @@ package hdfs
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"dbm-services/bigdata/db-tools/dbactuator/pkg/components"
 	"dbm-services/bigdata/db-tools/dbactuator/pkg/core/staticembed"
@@ -46,7 +46,7 @@ func (i *InitSystemConfigService) InitSystemConfig() (err error) {
 		return err
 	}
 	tmpScriptName := "/tmp/sysinit.sh"
-	if err = ioutil.WriteFile(tmpScriptName, data, 07555); err != nil {
+	if err = os.WriteFile(tmpScriptName, data, 07555); err != nil {
 		logger.Error("write tmp script failed %s", err.Error())
 		return err
 	}

dbm-services/bigdata/db-tools/dbactuator/pkg/components/hdfs/install_hdfs.go

@@ -432,6 +432,10 @@ func (i *InstallHdfsService) WriteDfsHostConfig() error {
 	buf := bytes.NewBufferString("")
 	for _, dnIp := range dnIps {
 		dnHost := i.Params.HostMap[dnIp]
+		// 若无匹配，使用dnIp
+		if dnHost == "" {
+			dnHost = dnIp
+		}
 		buf.WriteString(fmt.Sprintln(dnHost))
 	}
 	return os.WriteFile(i.HdfsConfDir+"/"+"dfs.include", buf.Bytes(), 0644)

dbm-services/bigdata/db-tools/dbactuator/pkg/components/hdfs/node_operation.go

@@ -106,6 +106,12 @@ func (i *NodeOperationService) CleanData() (err error) {
 		logger.Error("[%s] execute failed, %v", extraCmd, err)
 		return err
 	}
+	// 删除用户
+	extraCmd = `userdel -f hadoop; rm -rf /home/hadoop; rm -f /var/spool/mail/hadoop`
+	if _, err = osutil.ExecShellCommand(false, extraCmd); err != nil {
+		// 只打印错误日志 不返回失败
+		logger.Error("[%s] execute failed, %v", extraCmd, err)
+	}
 	return nil
 }
 

dbm-services/bigdata/db-tools/dbactuator/pkg/components/hdfs/util/disk.go

@@ -76,6 +76,8 @@ func GetLocalHostNameByMap(hostMap map[string]string) string {
 				value, exists := hostMap[localIP]
 				if exists {
 					return value
+				} else {
+					return localIP
 				}
 			}
 		}

dbm-services/bigdata/db-tools/dbactuator/pkg/components/kafka/install_kafka.go

@@ -150,7 +150,7 @@ export JRE=$JAVA_HOME/jre
 export KAFKA_PORT=%s
 
 # PATH 优先包含 mysql 和 jdk/jre bin
-export PATH=/usr/local/mysql/bin:$JAVA_HOME/bin:$JRE/bin:$PATH
+export PATH=/usr/local/bin:/usr/local/mysql/bin:$JAVA_HOME/bin:$JRE/bin:$PATH
 
 # 类路径
 export CLASSPATH=".:$JAVA_HOME/lib:$JRE/lib:$CLASSPATH"
@@ -205,6 +205,14 @@ export SASL_ENABLED=true
 		}
 	}
 
+	// 创建 java 软链接到 /usr/bin/java，解决 crontab 拉起 supervisord 时找不到 java 的问题
+	extraCmd = "[ ! -e /usr/bin/java ] && ln -sf $JAVA_HOME/bin/java /usr/bin/java || true"
+	if _, err := osutil.ExecShellCommand(false, extraCmd); err != nil {
+		logger.Error("创建java软链接失败: %s", err.Error())
+		return err
+	}
+	logger.Info("检查并创建java软链接完成")
+
 	return nil
 }
 
@@ -346,7 +354,7 @@ func configCrontab() (err error) {
 		return err
 	}
 	extraCmd = fmt.Sprintf(
-		`echo '*/1 * * * *  %s >> /data/kafkaenv/supervisor/check_supervisord.err 2>&1' >>%s`,
+		`echo '*/1 * * * *  source /etc/profile && %s >> /data/kafkaenv/supervisor/check_supervisord.err 2>&1' >>%s`,
 		"/data/kafkaenv/supervisor/check_supervisord.sh", "/home/mysql/crontab.bak")
 	if _, err = osutil.ExecShellCommand(false, extraCmd); err != nil {
 		logger.Error("%s execute failed, %v", extraCmd, err)

dbm-services/bigdata/db-tools/dbactuator/pkg/components/pulsar/install_pulsar.go

@@ -131,7 +131,7 @@ func (i *InstallPulsarComp) InitPulsarDirs() error {
 ulimit -n 500000
 export JAVA_HOME=/data/pulsarenv/java/jdk
 export JRE=$JAVA_HOME/jre
-export PATH=$JAVA_HOME/bin:$JRE_HOME/bin:$PATH
+export PATH=/usr/local/bin:$JAVA_HOME/bin:$JRE_HOME/bin:$PATH
 export CLASSPATH=".:$JAVA_HOME/lib:$JRE/lib:$CLASSPATH"
 export LC_ALL=en_US
 EOF

dbm-services/bigdata/db-tools/dbactuator/pkg/core/staticembed/sysinit_hdfs.sh

@@ -38,7 +38,7 @@ export JAVA_HOME="/data/hadoopenv/java"
 export CLASSPATH=".:$JAVA_HOME/lib:$JRE/lib:$CLASSPATH"
 export HADOOP_HOME="/data/hadoopenv/hadoop"
 export HADOOP_CONF_DIR="$HADOOP_HOME/etc/hadoop"
-export PATH="${JAVA_HOME}/bin:${HADOOP_HOME}/bin:${HADOOP_HOME}/sbin:$PATH"
+export PATH="/usr/local/bin:${JAVA_HOME}/bin:${HADOOP_HOME}/bin:${HADOOP_HOME}/sbin:$PATH"
 EOF
 
 chown hadoop:root /data/hadoopenv/hdfsProfile