fix(redis): dbmon备份文件清理行为 TencentBlueKing#8334

xiepaup · Dec 2, 2024 · 56f10d9 · 56f10d9
1 parent 3a857db
commit 56f10d9
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/dbm-services/redis/db-tools/dbmon/pkg/redisbinlogbackup/job.go b/dbm-services/redis/db-tools/dbmon/pkg/redisbinlogbackup/job.go
@@ -274,25 +274,16 @@ func (job *Job) DeleteTooOldBinlogbackup(port int) {
 	Days15Ago := time.Now().Local().AddDate(0, 0, -15)
 	mylog.Logger.Debug(fmt.Sprintf("port:%d start DeleteTooOldBinlogbackup", port))
 
-	// 15 天以前的,本地文件已删除的,记录直接删除
-	job.Err = job.sqdb.Where("start_time<=? and local_file_removed=?", Days15Ago, 1).
-		Delete(&RedisBinlogHistorySchema{}).Error
-	if job.Err != nil {
-		job.Err = fmt.Errorf(
-			"DeleteTooOldBinlogbackup gorm delete fail,err:%v,start_time:(%s) local_file_removed:%d",
-			job.Err, Days15Ago, 1)
-		mylog.Logger.Error(job.Err.Error())
-		return
-	}
 	// OldFileLeftDay天以以前的,本地文件未删除的,remove本地文件,并记录下该行为
-	job.Err = job.sqdb.Where("start_time<=? and local_file_removed=?", NDaysAgo, 0).Find(&toDoRows).Error
+	job.Err = job.sqdb.Where("end_time<=? and local_file_removed=?", NDaysAgo, 0).Find(&toDoRows).Error
 	if job.Err != nil && job.Err != gorm.ErrRecordNotFound {
 		job.Err = fmt.Errorf("DeleteTooOldBinlogbackup gorm find fail,err:%v", job.Err)
 		mylog.Logger.Error(job.Err.Error())
 		return
 	}
 	job.Err = nil
 	for _, row := range toDoRows {
+		mylog.Logger.Info(fmt.Sprintf("begin delete old file:%s,4 ModfyTime:%s", row.BackupFile, row.EndTime.GoString()))
 		removeOK = true
 		if util.FileExists(row.BackupFile) {
 			err = os.Remove(row.BackupFile)
@@ -312,4 +303,15 @@ func (job *Job) DeleteTooOldBinlogbackup(port int) {
 			mylog.Logger.Error(job.Err.Error())
 		}
 	}
+
+	// 15 天以前的,本地文件已删除的,记录直接删除
+	job.Err = job.sqdb.Where("end_time<=? and local_file_removed=?", Days15Ago, 1).
+		Delete(&RedisBinlogHistorySchema{}).Error
+	if job.Err != nil {
+		job.Err = fmt.Errorf(
+			"DeleteTooOldBinlogbackup gorm delete fail,err:%v,start_time:(%s) local_file_removed:%d",
+			job.Err, Days15Ago, 1)
+		mylog.Logger.Error(job.Err.Error())
+		return
+	}
 }