From 65c371d210e421c639a84e49b2175c33bbad2e79 Mon Sep 17 00:00:00 2001
From: seanlook <seanlook7@gmail.com>
Date: Fri, 1 Sep 2023 15:09:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(mysql):=20=E4=BF=AE=E5=A4=8Dtendbcluster?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=97=AE=E9=A2=98=20close=20#958?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/mysql/install_new_dbbackup.go  | 22 +++++++++++++++++++
 .../mysql/restore/dbloader_restore.go         |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/install_new_dbbackup.go b/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/install_new_dbbackup.go
index e4f6a2e58f..fd1077ba77 100644
--- a/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/install_new_dbbackup.go
+++ b/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/install_new_dbbackup.go
@@ -54,6 +54,7 @@ type InstallNewDbBackupParam struct {
 	ClusterId      map[Port]int                 `json:"cluster_id"`                    // cluster id
 	ShardValue     map[Port]int                 `json:"shard_value"`                   // shard value for spider
 	ExecUser       string                       `json:"exec_user"`                     // 执行Job的用户
+	UntarOnly      bool                         `json:"untar_only"`                    // 只解压，不校验不渲染配置
 }
 
 type runtimeContext struct {
@@ -112,6 +113,10 @@ func (i *InstallNewDbBackupComp) Init() (err error) {
 	i.dbConn = make(map[int]*native.DbWorker)
 	i.versionMap = make(map[int]string)
 	i.renderCnf = make(map[int]config.BackupConfig)
+	if i.Params.UntarOnly {
+		logger.Info("untar_only=true do not try to connect")
+		return nil
+	}
 	for _, port := range i.Params.Ports {
 		dbwork, err := native.InsObject{
 			Host: i.Params.Host,
@@ -207,6 +212,11 @@ func (i *InstallNewDbBackupComp) getInsShardValue(port int) int {
 
 // InitRenderData 初始化待渲染的配置变量
 func (i *InstallNewDbBackupComp) InitRenderData() (err error) {
+	if i.Params.UntarOnly {
+		logger.Info("untar_only=true do not need InitRenderData")
+		return nil
+	}
+
 	bkuser := i.GeneralParam.RuntimeAccountParam.DbBackupUser
 	bkpwd := i.GeneralParam.RuntimeAccountParam.DbBackupPwd
 	regexfunc, err := db_table_filter.NewDbTableFilter([]string{"*"}, []string{"*"}, i.ignoredbs, i.ignoretbls)
@@ -307,6 +317,10 @@ func (i *InstallNewDbBackupComp) DecompressPkg() (err error) {
 // InitBackupUserPriv 创建备份用户
 // TODO 用户初始化考虑在部署 mysqld 的时候进行
 func (i *InstallNewDbBackupComp) InitBackupUserPriv() (err error) {
+	if i.Params.UntarOnly {
+		logger.Info("untar_only=true do not need InitBackupUserPriv")
+		return nil
+	}
 	for _, port := range i.Params.Ports {
 		err := i.initPriv(port, false)
 		if err != nil {
@@ -348,6 +362,10 @@ func (i *InstallNewDbBackupComp) initPriv(port int, isTdbCtl bool) (err error) {
 
 // GenerateDbbackupConfig TODO
 func (i *InstallNewDbBackupComp) GenerateDbbackupConfig() (err error) {
+	if i.Params.UntarOnly {
+		logger.Info("untar_only=true do not need GenerateDbbackupConfig")
+		return nil
+	}
 	// 先渲染模版配置文件
 	templatePath := path.Join(i.installPath, fmt.Sprintf("%s.tpl", cst.BackupFile))
 	if err := i.saveTplConfigfile(templatePath); err != nil {
@@ -458,6 +476,10 @@ func (i *InstallNewDbBackupComp) saveTplConfigfile(tmpl string) (err error) {
 
 // AddCrontab TODO
 func (i *InstallNewDbBackupComp) AddCrontab() error {
+	if i.Params.UntarOnly {
+		logger.Info("untar_only=true do not need AddCrontab")
+		return nil
+	}
 	if i.Params.ClusterType == cst.TendbCluster {
 		return i.addCrontabSpider()
 	} else {
diff --git a/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/restore/dbloader_restore.go b/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/restore/dbloader_restore.go
index 44fbd58fb0..441887bfc6 100644
--- a/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/restore/dbloader_restore.go
+++ b/dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/restore/dbloader_restore.go
@@ -190,7 +190,7 @@ func (m *DBLoader) getChangeMasterPos(masterInst native.Instance) (*mysqlutil.Ch
 		return nil, errors.New("no master info found in metadata")
 	}
 	if masterInst.Host == "" || masterInst.Port == 0 { // 说明不关注备份位点信息
-		return nil, nil
+		return &mysqlutil.ChangeMaster{}, nil
 	}
 	// 如果备份文件的源实例，就是当前恢复要change master to 的实例，直接用 MasterStatus info
 	if masterInfo.MasterHost == masterInst.Host && masterInfo.MasterPort == masterInst.Port {