This is an automated cherry-pick of #5338

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
pingcap · Oct 20, 2023 · e023da2 · e023da2
1 parent 6803b50
commit e023da2
Show file tree

Hide file tree

Showing 8 changed files with 2,690 additions and 4 deletions.
diff --git a/cmd/backup-manager/app/cmd/restore.go b/cmd/backup-manager/app/cmd/restore.go
@@ -53,6 +53,7 @@ func NewRestoreCommand() *cobra.Command {
 	cmd.Flags().StringVar(&ro.PitrRestoredTs, "pitrRestoredTs", "0", "The pitr restored ts")
 	cmd.Flags().BoolVar(&ro.Prepare, "prepare", false, "Whether to prepare for restore")
 	cmd.Flags().StringVar(&ro.TargetAZ, "target-az", "", "For volume-snapshot restore, which az the volume snapshots restore to")
+	cmd.Flags().BoolVar(&ro.UseFSR, "use-fsr", false, "EBS snapshot restore use FSR for TiKV data volumes or not")
 	return cmd
 }
 

diff --git a/cmd/backup-manager/app/restore/restore.go b/cmd/backup-manager/app/restore/restore.go
@@ -44,6 +44,8 @@ type Options struct {
 	Prepare bool
 	// TargetAZ indicates which az the volume snapshots restore to. It's used in volume-snapshot mode.
 	TargetAZ string
+	// UseFSR to indicate if use FSR for TiKV data volumes during EBS snapshot restore
+	UseFSR bool
 }
 
 func (ro *Options) restoreData(
@@ -106,6 +108,11 @@ func (ro *Options) restoreData(
 			csbPath = path.Join(util.BRBinPath, "csb_restore.json")
 			args = append(args, fmt.Sprintf("--output-file=%s", csbPath))
 			args = append(args, fmt.Sprintf("--target-az=%s", ro.TargetAZ))
+			if ro.UseFSR {
+				args = append(args, "--use-fsr=true")
+			} else {
+				args = append(args, "--use-fsr=false")
+			}
 			progressStep = "Volume Restore"
 		} else {
 			progressStep = "Data Restore"

diff --git a/cmd/backup-manager/app/util/util.go b/cmd/backup-manager/app/util/util.go
@@ -70,6 +70,10 @@ func validCmdFlagFunc(flag *pflag.Flag) {
 		return
 	}
 
+	if flag.Name == "use-fsr" {
+		return
+	}
+
 	cmdutil.CheckErr(fmt.Errorf(cmdHelpMsg, flag.Name))
 }
 

diff --git a/images/ebs-warmup/warmup-steps.sh b/images/ebs-warmup/warmup-steps.sh
@@ -51,7 +51,7 @@ while [ $# -gt 0 ]; do
             die "unsupported flag $1"
             ;;
         *)
-            echo "spawning wram up task: operation = $operation; file path = $1"
+            echo "spawning warm up task: operation = $operation; file path = $1"
             case "$operation" in
                 fio) 
                     device=$(dev_name_by_mount_point "$1")