feat(backend): optimize dbha crontab and Makefile close #11320

Author: xjxia

dbm-services/common/dbha/ha-module/Makefile

@@ -2,10 +2,11 @@ SHELL := /bin/bash
 BASE_DIR = $(shell pwd)
 VERSION = $(shell git describe --tags --always --dirty)
 GITHASH = $(shell git rev-parse --short HEAD)
+BUILDTIME = $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 APPNAME = dbha
 GOOS ?= linux
-BUILD_FLAG = " -X main.version=${VERSION} -X main.githash=${GITHASH} "
-BUILD_MINI_FLAG = " -s -w -X main.version=${VERSION} -X main.githash=${GITHASH} "
+BUILD_FLAG = " -X main.version=${VERSION} -X main.githash=${GITHASH} -X main.buildTime=${BUILDTIME}"
+BUILD_MINI_FLAG = " -s -w -X main.version=${VERSION} -X main.githash=${GITHASH} -X main.buildTime=${BUILDTIME}"
 
 .PHONY: build mini clean gotool image
 

dbm-services/common/dbha/ha-module/dbha.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"time"
 
 	"dbm-services/common/dbha/ha-module/agent"
 	"dbm-services/common/dbha/ha-module/config"
@@ -20,6 +21,7 @@ var configFile string
 var showVersion bool
 var version = "1.0.0"
 var githash = "unknown"
+var buildStamp = time.Now().Format("2006-01-02 15:04:05")
 
 // Init TODO
 func Init() {
@@ -35,6 +37,7 @@ func main() {
 	if showVersion {
 		fmt.Println("Version:", version)
 		fmt.Println("Git hash info:", githash)
+		fmt.Println("BuildTime:", buildStamp)
 		os.Exit(0)
 	}
 

dbm-ui/backend/flow/utils/cloud/script_template/dbha_template.py

@@ -12,7 +12,7 @@
 
 ha_gm_conf_template = """
 log_conf:
-  log_path: "./log"
+  log_path: "./log/log"
   log_level: "LOG_DEBUG"
   log_maxsize: 512
   log_maxbackups: 1000
@@ -154,7 +154,7 @@
 
 ha_agent_conf_template = """
 log_conf:
-  log_path: "./log"
+  log_path: "./log/log"
   log_level: "LOG_DEBUG"
   log_maxsize: 512
   log_maxbackups: 1000
@@ -303,6 +303,7 @@
 
 # 准备相关文件
 mkdir -p $path/dbha/{{dbha_type}};
+mkdir -p $path/dbha/{{dbha_type}}/log;
 cp /data/install/{{dbha_conf}} $path/dbha/{{dbha_type}};
 cp /data/install/dbha $path/dbha/{{dbha_type}};
 chmod -R 777 $path/dbha;
@@ -317,23 +318,28 @@
 echo "----------------------------------------------------------------";
 
 # 增加定期拉起任务
-dbha_cron="$path/dbha/{{dbha_type}}/cron.sh";
+dbha_cron="$path/dbha/{{dbha_type}}/check_agent_alive.sh";
 echo -e "
-# 检查进程是否存在
-is_process_running() {
-    ps aux | grep {{dbha_conf}} | grep -v grep | awk '{print \$2}' > /dev/null
+#!/bin/sh
+LOG="/var/log/dbha_watchdog.log"
+
+cd $path/dbha/{{dbha_type}} || {
+  echo "$(date) [ERROR] dbha work directory not exist" >> $LOG
+  exit 1
 }
-if ! is_process_running; then
-    echo "Process {{dbha_type}} is not running. Restarting..."
-    cd /usr/local/bkdb/dbha/{{dbha_type}}
-    # 启动进程的命令
-    nohup ./dbha -config_file=ha-{{dbha_type}}.conf -type={{dbha_type}} -> dbha-apply.log 2>&1 &
-    echo "Process {{dbha_type}} restarted successfully."
+
+if ! ps -ef|grep "dbha -config_file={{dbha_conf}}"|grep -v grep; then
+  echo "$(date) [ERROR] dbha process not found" >> $LOG
+  if nohup ./dbha -config_file={{dbha_conf}} -type={{dbha_type}} - >> runtime.log 2>&1 & then
+    echo "$(date) [OK] restart ok PID:$!" >> $LOG
+  else
+    echo "$(date) [FAIL] restart failed" >> $LOG
+  fi
 fi
 " > $dbha_cron
 
 chmod +x $dbha_cron;
-(crontab -l ; echo "* * * * * $dbha_cron") 2>&1 | grep -v "no crontab" | sort | uniq | crontab -
+(crontab -l ; echo "*/3 * * * * $dbha_cron > /dev/null 2>&1") 2>&1 | grep -v "no crontab" | sort | uniq | crontab -
 """
 
 dbha_stop_script_template = """