fix(redis): tendisplus 备份用高版本tar TencentBlueKing#9250

Author: xiepaup

dbm-services/redis/db-tools/dbmon/pkg/consts/consts.go

@@ -3,7 +3,7 @@ package consts
 
 // version
 const (
-	BkDbmonVersion = "v0.16"
+	BkDbmonVersion = "v0.17"
 )
 
 const (
@@ -126,6 +126,7 @@ const (
 	TendisKeyLifecycleBin   = "/home/mysql/dbtools/tendis-key-lifecycle"
 	ZkWatchBin              = "/home/mysql/dbtools/zkwatch"
 	ZstdBin                 = "/home/mysql/dbtools/zstd"
+	TarBin                  = "/home/mysql/dbtools/tar"
 	LzopBin                 = "/home/mysql/dbtools/lzop"
 	LdbWithV38Bin           = "/home/mysql/dbtools/ldb_with_len.3.8"
 	LdbWithV513Bin          = "/home/mysql/dbtools/ldb_with_len.5.13"

dbm-services/redis/db-tools/dbmon/pkg/redisfullbackup/task.go

@@ -439,7 +439,7 @@ func (task *BackupTask) TendisplusInstanceBackup() {
 		return
 	}
 	task.EndTime = time.Now().Local()
-	tarFile, task.Err = util.TarADir(backupFullDir, task.BackupDir, true)
+	tarFile, task.Err = util.TarADir(backupFullDir, task.BackupDir, true, true)
 	task.BackupFile = tarFile
 	if task.Err != nil {
 		mylog.Logger.Error(task.Err.Error())
@@ -514,7 +514,7 @@ func (task *BackupTask) TendisSSDInstanceBackup() {
 	backupFullDir = fileWithBinlogPos
 
 	// 只做打包,不做压缩,rocksdb中已经做了压缩
-	tarFile, task.Err = util.TarADir(backupFullDir, task.BackupDir, true)
+	tarFile, task.Err = util.TarADir(backupFullDir, task.BackupDir, true, false)
 	if task.Err != nil {
 		mylog.Logger.Error(task.Err.Error())
 		return

dbm-services/redis/db-tools/dbmon/util/compress.go

@@ -126,8 +126,12 @@ func SplitLargeFile(file, splitTargetSize string, rmOrigin bool) (splitedFiles [
 // 参数: originDir 为 /data/dbbak/REDIS-FULL-rocksdb-1.1.1.1-30000
 // 参数: tarSaveDir 为 /tmp/
 // 返回值: tarFile 为  /tmp/REDIS-FULL-rocksdb-1.1.1.1-30000.tar
-func TarADir(originDir, tarSaveDir string, rmOrigin bool) (tarFile string, err error) {
+func TarADir(originDir, tarSaveDir string, rmOrigin bool, tarUseDbTools bool) (tarFile string, err error) {
 	var tarCmd, rmCmd string
+	tarBin := "tar" // use by default: system
+	if tarUseDbTools {
+		tarBin = consts.TarBin
+	}
 	basename := filepath.Base(originDir)
 	baseDir := filepath.Dir(originDir)
 	if tarSaveDir == "" {
@@ -136,23 +140,23 @@ func TarADir(originDir, tarSaveDir string, rmOrigin bool) (tarFile string, err e
 	tarFile = filepath.Join(tarSaveDir, basename+".tar")
 
 	if rmOrigin {
-		tarCmd = fmt.Sprintf(`cd %s && tar -cf %s  %s && rm -rf %s`,
-			baseDir, filepath.Base(tarFile), basename, basename)
+		tarCmd = fmt.Sprintf(`cd %s && %s -cf %s  %s && rm -rf %s`,
+			baseDir, tarBin, filepath.Base(tarFile), basename, basename)
 		rmCmd = fmt.Sprintf("rm -f %s", tarFile)
 	} else {
-		tarCmd = fmt.Sprintf(`cd %s && tar -cf %s %s`, baseDir, filepath.Base(tarFile), basename)
+		tarCmd = fmt.Sprintf(`cd %s && %s -cf %s %s`, baseDir, tarBin, filepath.Base(tarFile), basename)
 		rmCmd = fmt.Sprintf("rm -f %s", tarFile)
 	}
 	mylog.Logger.Info(tarCmd)
 	maxRetryTimes := 5
 	for maxRetryTimes >= 0 {
 		maxRetryTimes--
 		err = nil
-		_, err = RunBashCmd(tarCmd, "", nil, 6*time.Hour)
+		_, err = RunBashCmd(tarCmd, "", nil, 8*time.Hour)
 		if err != nil && !strings.Contains(err.Error(), "file changed as we read it") {
 			// 如果报错则删除tar文件然后重试
 			mylog.Logger.Info(rmCmd)
-			RunBashCmd(rmCmd, "", nil, 10*time.Minute)
+			RunBashCmd(rmCmd, "", nil, 30*time.Minute)
 			continue
 		}
 		err = nil
@@ -169,7 +173,7 @@ func TarADir(originDir, tarSaveDir string, rmOrigin bool) (tarFile string, err e
 func TarAndSplitADir(originDir, targetSaveDir, splitTargetSize string, rmOrigin bool) (
 	splitedFiles []string, err error) {
 	var tarFile string
-	tarFile, err = TarADir(originDir, targetSaveDir, rmOrigin)
+	tarFile, err = TarADir(originDir, targetSaveDir, rmOrigin, false)
 	if err != nil {
 		return
 	}