feat(mysql): table-checksum-deprecate-job-context #14464

Author: xfwduke

dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/pt_table_checksum.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"dbm-services/mysql/db-tools/dbactuator/pkg/components/peripheraltools/v2/checksum"
 	"dbm-services/mysql/db-tools/mysql-table-checksum/pkg/config"
+	"encoding/json"
 	"fmt"
 	"os"
 	"os/exec"
 	"path"
-	"strings"
 	"time"
 
 	"dbm-services/common/go-pubpkg/logger"
@@ -138,17 +138,20 @@ func (c *PtTableChecksumComp) GenerateConfigFile() (err error) {
 		c.Params.BkBizId, c.Params.ClusterId, c.Params.MasterPort,
 		c.Params.InnerRole, "", c.Params.ImmuteDomain, c.Params.MasterIp,
 		c.GeneralParam.RuntimeAccountParam.MonitorUser, c.GeneralParam.RuntimeAccountParam.MonitorPwd,
-		"http://127.0.0.1:9999", logDir, c.Params.RuntimeHour, c.tools)
+		"http://127.0.0.1:9999", logDir, c.Params.RuntimeHour, c.tools,
+	)
 
 	cfg.PtChecksum.Replicate = c.Params.ReplicateTable
 
 	var ignoreDbs []string
 	ignoreDbs = append(ignoreDbs, c.Params.SystemDbs...)
-	ignoreDbs = append(ignoreDbs, []string{
-		fmt.Sprintf(`%s%%`, c.Params.StageDBHeader),
-		`bak_%`,
-		fmt.Sprintf(`%%%s`, c.Params.RollbackDBTail),
-	}...)
+	ignoreDbs = append(
+		ignoreDbs, []string{
+			fmt.Sprintf(`%s%%`, c.Params.StageDBHeader),
+			`bak_%`,
+			fmt.Sprintf(`%%%s`, c.Params.RollbackDBTail),
+		}...,
+	)
 
 	cfg.SetFilter(c.Params.DbPatterns, ignoreDbs, c.Params.TablePatterns, c.Params.IgnoreTables)
 
@@ -249,7 +252,11 @@ func (c *PtTableChecksumComp) doChecksum() (err error) {
 		return err
 	}
 
-	fmt.Println(components.WrapperOutputString(strings.TrimSpace(stdout.String())))
+	o := make(map[string]string)
+	o["raw_checksum_report"] = stdout.String()
+	b, _ := json.Marshal(o)
+
+	fmt.Println(components.WrapperOutputString(string(b)))
 	return nil
 }
 

dbm-services/mysql/db-tools/mysql-crond/start.sh

@@ -10,9 +10,9 @@ pgrep -x 'mysql-crond' && echo "mysql-crond process already running" && exit 1
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 if [ $# -eq 0 ];then
   # echo "run default ./mysql-crond -c runtime.yaml" 
-  START_CMD="cd $SCRIPT_DIR && nohup ./mysql-crond -c runtime.yaml 1>/dev/null 2>start-crond.err &"
+  START_CMD="cd $SCRIPT_DIR && rm -f start-crond.err && nohup ./mysql-crond -c runtime.yaml 1>/dev/null 2>start-crond.err &"
 else
-  START_CMD="cd $SCRIPT_DIR && nohup ./mysql-crond ${@:1} 1>/dev/null 2>start-crond.err &"
+  START_CMD="cd $SCRIPT_DIR && rm -f start-crond.err && nohup ./mysql-crond ${@:1} 1>/dev/null 2>start-crond.err &"
 fi
 
 

dbm-services/mysql/db-tools/mysql-table-checksum/.gitignore

@@ -1,4 +1,5 @@
 checksum.sqlite
 .idea
 *.log
-build
+build
+test

dbm-services/mysql/db-tools/mysql-table-checksum/pkg/checker/define.go

@@ -1,8 +1,12 @@
 package checker
 
 import (
+	"bytes"
+	"compress/gzip"
 	"context"
+	"encoding/base64"
 	"encoding/json"
+	"log/slog"
 	"time"
 
 	"dbm-services/mysql/db-tools/mysql-table-checksum/pkg/config"
@@ -58,3 +62,38 @@ func (c *Output) String() string {
 	b, _ := json.Marshal(*c)
 	return string(b)
 }
+
+func (c *Output) ZipString() (string, error) {
+	b, _ := json.Marshal(*c)
+	slog.Info("run checksum", slog.String("raw report", string(b)))
+
+	var zb bytes.Buffer
+	gz, err := gzip.NewWriterLevel(&zb, gzip.BestCompression)
+	if err != nil {
+		return "", err
+	}
+	defer func() {
+		_ = gz.Close()
+	}()
+
+	_, err = gz.Write(b)
+	if err != nil {
+		return "", err
+	}
+
+	err = gz.Flush()
+	if err != nil {
+		return "", err
+	}
+
+	err = gz.Close()
+	if err != nil {
+		return "", err
+	}
+
+	slog.Info("run checksum", slog.Any("zipped report", zb.Bytes()))
+
+	encodeReport := base64.StdEncoding.EncodeToString(zb.Bytes())
+	slog.Info("run checksum", slog.String("encoded report", encodeReport))
+	return encodeReport, nil
+}