Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(mysql): tokudb备份恢复修复 #8451 #8456

Merged
merged 1 commit into from
Dec 12, 2024
Merged

feat(mysql): tokudb备份恢复修复 #8451 #8456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
260 changes: 140 additions & 120 deletions dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/backupdemand/backup_demand.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"bufio"
"encoding/json"
"fmt"
"math/rand"
"os"
"path/filepath"
"slices"
Expand All @@ -24,7 +23,6 @@ import (
"github.com/pkg/errors"

"dbm-services/common/go-pubpkg/cmutil"
"dbm-services/common/go-pubpkg/mysqlcomm"
"dbm-services/mysql/db-tools/dbactuator/pkg/components"
"dbm-services/mysql/db-tools/dbactuator/pkg/core/cst"
"dbm-services/mysql/db-tools/dbactuator/pkg/tools"
Expand All @@ -38,9 +36,10 @@ import (
)

type Component struct {
Params *Param `json:"extend"`
tools *tools.ToolSet
context `json:"-"`
GeneralParam *components.GeneralParam `json:"general"`
Params *Param `json:"extend"`
tools *tools.ToolSet
context `json:"-"`
}

type Param struct {
Expand All @@ -62,14 +61,13 @@ type Param struct {
}

type context struct {
backupConfigPaths map[int]string
now time.Time
randString string
//resultReportPath string
backupConfigPath string
now time.Time
statusReportPath string
reportPath string
backupPort []int // 当在 spider master备份时, 会有 [25000, 26000] 两个端口
backupPort int // 当在 spider master备份时, 会有 [25000, 26000] 两个端口
backupDir string //只是兼容tbinlogdumper的备份日志输出，存储备份目录信息，没有任何处理逻辑
db *native.DbWorker
}

type Report struct {
Expand All @@ -87,130 +85,124 @@ func (c *Component) Init() (err error) {
}

c.now = time.Now()
rand.Seed(c.now.UnixNano())
c.randString = fmt.Sprintf("%d%d", c.now.UnixNano(), rand.Intn(100))

c.backupConfigPaths = make(map[int]string)

c.backupPort = append(c.backupPort, c.Params.Port)
c.backupConfigPaths[c.Params.Port] = filepath.Join(
c.backupPort = c.Params.Port
c.backupConfigPath = filepath.Join(
cst.BK_PKG_INSTALL_PATH,
fmt.Sprintf("dbactuator-%s", c.Params.BillId),
fmt.Sprintf("dbbackup.%d.%s.ini", c.Params.Port, c.randString),
fmt.Sprintf("dbbackup.%d.%s.ini", c.Params.Port, c.Params.BackupId),
)

if c.Params.Role == cst.BackupRoleSpiderMaster {
tdbctlPort := mysqlcomm.GetTdbctlPortBySpider(c.Params.Port)
c.backupPort = append(c.backupPort, tdbctlPort)

c.backupConfigPaths[tdbctlPort] = filepath.Join(
cst.BK_PKG_INSTALL_PATH,
fmt.Sprintf("dbactuator-%s", c.Params.BillId),
fmt.Sprintf("dbbackup.%d.%s.ini", tdbctlPort, c.randString),
)
c.db, err = native.InsObject{
Host: c.Params.Host,
Port: c.backupPort,
User: c.GeneralParam.RuntimeAccountParam.MonitorUser,
Pwd: c.GeneralParam.RuntimeAccountParam.MonitorPwd,
}.Conn()
if err != nil {
logger.Error("init db connection failed: %s", err.Error())
return err
}

return nil
}

func (c *Component) GenerateBackupConfig() error {
for _, port := range c.backupPort {
dailyBackupConfigPath := filepath.Join(
cst.DbbackupGoInstallPath,
fmt.Sprintf("dbbackup.%d.ini", port),
)

dailyBackupConfigFile, err := ini.LoadSources(ini.LoadOptions{
PreserveSurroundedQuote: true,
IgnoreInlineComment: true,
AllowBooleanKeys: true,
AllowShadows: true,
}, dailyBackupConfigPath)
if err != nil {
logger.Error("load %s failed: %s", dailyBackupConfigPath, err.Error())
return err
}

var backupConfig config.BackupConfig
err = dailyBackupConfigFile.MapTo(&backupConfig)
if err != nil {
logger.Error("map %s to struct failed: %s", dailyBackupConfigPath, err.Error())
return err
}

backupConfig.Public.BackupType = c.Params.BackupType
backupConfig.Public.BackupTimeOut = ""
backupConfig.Public.BillId = c.Params.BillId
backupConfig.Public.BackupId = c.Params.BackupId
backupConfig.Public.DataSchemaGrant = strings.Join(c.Params.BackupGSD, ",")
backupConfig.Public.ShardValue = c.Params.ShardID
if backupConfig.BackupClient.Enable && c.Params.BackupFileTag != "" {
backupConfig.BackupClient.FileTag = c.Params.BackupFileTag
}

backupConfig.LogicalBackup.Regex = ""
if c.Params.BackupType == "logical" {
backupConfig.LogicalBackup.UseMysqldump = "auto"
ignoreDbs := slices.DeleteFunc(native.DBSys, func(s string) bool {
return s == "infodba_schema"
})
ignoreDbs = append(ignoreDbs, c.Params.IgnoreDbs...)
backupConfig.LogicalBackup.Databases = strings.Join(c.Params.DbPatterns, ",")
backupConfig.LogicalBackup.ExcludeDatabases = strings.Join(ignoreDbs, ",")
backupConfig.LogicalBackup.Tables = strings.Join(c.Params.TablePatterns, ",")
backupConfig.LogicalBackup.ExcludeTables = strings.Join(c.Params.IgnoreTables, ",")

tf, err := db_table_filter.NewFilter(
c.Params.DbPatterns, c.Params.TablePatterns,
ignoreDbs, c.Params.IgnoreTables,
)
if err != nil {
logger.Error("create table filter failed: %s", err.Error())
return err
}
backupConfig.LogicalBackup.Regex = tf.TableFilterRegex()
}
dailyBackupConfigPath := filepath.Join(
cst.DbbackupGoInstallPath,
fmt.Sprintf("dbbackup.%d.ini", c.backupPort),
)

if c.Params.CustomBackupDir != "" {
backupConfig.Public.BackupDir = filepath.Join(
backupConfig.Public.BackupDir,
fmt.Sprintf("%s_%s_%d_%s",
c.Params.CustomBackupDir,
c.now.Format("20060102150405"),
port,
c.randString))
dailyBackupConfigFile, err := ini.LoadSources(ini.LoadOptions{
PreserveSurroundedQuote: true,
IgnoreInlineComment: true,
AllowBooleanKeys: true,
AllowShadows: true,
}, dailyBackupConfigPath)
if err != nil {
logger.Error("load %s failed: %s", dailyBackupConfigPath, err.Error())
return err
}

err := os.Mkdir(backupConfig.Public.BackupDir, 0755)
if err != nil {
logger.Error("mkdir %s failed: %s", backupConfig.Public.BackupDir, err.Error())
return err
}
var backupConfig config.BackupConfig
err = dailyBackupConfigFile.MapTo(&backupConfig)
if err != nil {
logger.Error("map %s to struct failed: %s", dailyBackupConfigPath, err.Error())
return err
}

}
// 增加为tbinlogdumper做库表备份的日志输出，保存流程上下文
c.backupDir = backupConfig.Public.BackupDir
backupConfig.Public.BackupType = c.Params.BackupType
backupConfig.Public.BackupTimeOut = ""
backupConfig.Public.BillId = c.Params.BillId
backupConfig.Public.BackupId = c.Params.BackupId
backupConfig.Public.DataSchemaGrant = strings.Join(c.Params.BackupGSD, ",")
backupConfig.Public.ShardValue = c.Params.ShardID
if backupConfig.BackupClient.Enable && c.Params.BackupFileTag != "" {
backupConfig.BackupClient.FileTag = c.Params.BackupFileTag
}

backupConfigFile := ini.Empty()
err = backupConfigFile.ReflectFrom(&backupConfig)
backupConfig.LogicalBackup.Regex = ""
if c.Params.BackupType == "logical" {
backupConfig.LogicalBackup.UseMysqldump = "auto"
ignoreDbs := slices.DeleteFunc(native.DBSys, func(s string) bool {
return s == "infodba_schema"
})
ignoreDbs = append(ignoreDbs, c.Params.IgnoreDbs...)
backupConfig.LogicalBackup.Databases = strings.Join(c.Params.DbPatterns, ",")
backupConfig.LogicalBackup.ExcludeDatabases = strings.Join(ignoreDbs, ",")
backupConfig.LogicalBackup.Tables = strings.Join(c.Params.TablePatterns, ",")
backupConfig.LogicalBackup.ExcludeTables = strings.Join(c.Params.IgnoreTables, ",")

tf, err := db_table_filter.NewFilter(
c.Params.DbPatterns, c.Params.TablePatterns,
ignoreDbs, c.Params.IgnoreTables,
)
if err != nil {
logger.Error("reflect backup config failed: %s", err.Error())
logger.Error("create table filter failed: %s", err.Error())
return err
}
backupConfig.LogicalBackup.Regex = tf.TableFilterRegex()
}

backupConfigPath := c.backupConfigPaths[port]
err = backupConfigFile.SaveTo(backupConfigPath)
if c.Params.CustomBackupDir != "" {
backupConfig.Public.BackupDir = filepath.Join(
backupConfig.Public.BackupDir,
fmt.Sprintf("%s_%s_%d_%s",
c.Params.CustomBackupDir,
c.now.Format("20060102150405"),
c.backupPort,
c.Params.BackupId))

err := os.Mkdir(backupConfig.Public.BackupDir, 0755)
if err != nil {
logger.Error("write backup config to %s failed: %s",
backupConfigPath, err.Error())
logger.Error("mkdir %s failed: %s", backupConfig.Public.BackupDir, err.Error())
return err
}

c.statusReportPath = filepath.Join(
backupConfig.Public.StatusReportPath,
fmt.Sprintf("dbareport_status_%d.log", c.Params.Port),
)
}
// 增加为tbinlogdumper做库表备份的日志输出，保存流程上下文
c.backupDir = backupConfig.Public.BackupDir

backupConfigFile := ini.Empty()
err = backupConfigFile.ReflectFrom(&backupConfig)
if err != nil {
logger.Error("reflect backup config failed: %s", err.Error())
return err
}

//backupConfigPath := c.backupConfigPath[port]
err = backupConfigFile.SaveTo(c.backupConfigPath)
if err != nil {
logger.Error("write backup config to %s failed: %s",
c.backupConfigPath, err.Error())
return err
}

c.statusReportPath = filepath.Join(
backupConfig.Public.StatusReportPath,
fmt.Sprintf("dbareport_status_%d.log", c.Params.Port),
)
//}

return nil
}

Expand All @@ -219,22 +211,50 @@ func (c *Component) ActuatorWorkDir() string {
return filepath.Dir(executable)
}

func (c *Component) DoBackup() error {
for _, port := range c.backupPort {
backupConfigPath := c.backupConfigPaths[port]
cmdArgs := []string{c.tools.MustGet(tools.ToolDbbackupGo), "dumpbackup", "--config", backupConfigPath}
cmdArgs = append(cmdArgs, "--log-dir", filepath.Join(c.ActuatorWorkDir(), "logs"))
logger.Info("backup command: %s", strings.Join(cmdArgs, " "))
// KillLegacyBackup
// 尽力而为尝试去结束残留的备份连接
func (c *Component) KillLegacyBackup() error {
defer func() {
_ = c.db.Close
}()

processList, err := c.db.SelectProcesslist([]string{c.GeneralParam.RuntimeAccountParam.DbBackupUser})
if err != nil {
logger.Error("get process list failed: %s", err.Error())
return err
}

_, errStr, err := cmutil.ExecCommand(false, "",
cmdArgs[0], cmdArgs[1:]...)
logger.Info("backup process %v found", processList)
if len(processList) == 0 {
return nil
}

for _, process := range processList {
_, err := c.db.Exec(`KILL ?`, process.ID)
if err != nil {
logger.Error("execute %s failed: %s, msg:%s", cmdArgs, err.Error(), errStr)
logger.Error("kill %s failed: %s", process.ID, err.Error())
return err
}
logger.Info("backup success with %s", backupConfigPath)
logger.Info("kill %v successfully", process)
}

return nil
}

func (c *Component) DoBackup() error {
cmdArgs := []string{c.tools.MustGet(tools.ToolDbbackupGo), "dumpbackup", "--config", c.backupConfigPath}
cmdArgs = append(cmdArgs, "--log-dir", filepath.Join(c.ActuatorWorkDir(), "logs"))
logger.Info("backup command: %s", strings.Join(cmdArgs, " "))

_, errStr, err := cmutil.ExecCommand(false, "",
cmdArgs[0], cmdArgs[1:]...)

if err != nil {
logger.Error("execute %s failed: %s, msg:%s", cmdArgs, err.Error(), errStr)
return err
}
logger.Info("backup success with %s", c.backupConfigPath)
//}
return nil
}

Expand Down
5 changes: 5 additions & 0 deletions dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql/clear_instance_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"path"
"strings"

"dbm-services/common/go-pubpkg/cmutil"
"dbm-services/common/go-pubpkg/logger"
"dbm-services/mysql/db-tools/dbactuator/pkg/components"
"dbm-services/mysql/db-tools/dbactuator/pkg/core/cst"
Expand Down Expand Up @@ -191,6 +192,10 @@ func (c *ClearInstanceConfigComp) clearRotateBinlog() (err error) {
binPath := path.Join(installPath, string(tools.ToolMysqlRotatebinlog))
configFile := path.Join(installPath, "config.yaml")

if !cmutil.FileExists(binPath) {
logger.Info("%s not exists, skip", binPath)
return nil
}
clearPortString := strings.Replace(strings.Trim(fmt.Sprint(c.Params.ClearPorts), "[]"), " ", ",", -1)
cmd := fmt.Sprintf(
`%s -c %s --removeConfig %s`, binPath, configFile, clearPortString,
Expand Down
1 change: 1 addition & 0 deletions dbm-services/mysql/db-tools/mysql-dbbackup/cmd/subcmd_migrateold.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ func migrateOld(cmd *cobra.Command, args []string) (errs error) {
if indexFilePath, indexContent, err := backupexe.MigrateInstanceBackupInfo(infoFilePath, &cnf); err != nil {
//errMsg := fmt.Sprintf("failed migrate backup info port %d\n: %s", cnf.Public.MysqlPort, err.Error())
//errs = errors2.Join(errs, errors.New(errMsg))
fmt.Println(err)
continue
} else {
fmt.Println("migrate infoFile", infoFilePath)
Expand Down
Loading
Loading