Merge branch 'master' into tikv-gc-time

charts/tidb-backup/values.yaml

@@ -41,8 +41,11 @@ storage:
  className: local-storage
  size: 100Gi
 
-# backupOptions is the options of mydumper https://github.com/maxbube/mydumper/blob/master/docs/mydumper_usage.rst#options
-backupOptions: "--verbose=3"
+# -t is thread count, larger thread count will speed up the backup, but may impact the performance of the upstream TiDB.
+# -F is the chunk size, a big table is partitioned into many chunks.
+# Other useful options are -B for database, and -T for tables.
+# See https://github.com/maxbube/mydumper/blob/master/docs/mydumper_usage.rst#options for more options.
+backupOptions: "-t 16 -F 256 --skip-tz-utc --verbose=3"
 # Set the tidb_snapshot to be used for the backup
 # Use `show master status` to get the ts:
 # MySQL [(none)]> show master status;

charts/tidb-cluster/values.yaml

@@ -519,8 +519,11 @@ scheduledBackup:
  failedJobsHistoryLimit: 1
  # https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#starting-deadline
  startingDeadlineSeconds: 3600
- # https://github.com/maxbube/mydumper/blob/master/docs/mydumper_usage.rst#options
- options: "--verbose=3"
+ # -t is thread count, larger thread count will speed up the backup, but may impact the performance of the upstream TiDB.
+ # -F is the chunk size, a big table is partitioned into many chunks.
+ # Other useful options are -B for database, and -T for tables.
+ # See https://github.com/maxbube/mydumper/blob/master/docs/mydumper_usage.rst#options for more options.
+ options: "-t 16 -F 256 --skip-tz-utc --verbose=3"
  # The time limit during which data is retained for each GC when backup, in the format of Go Duration.
  # When a GC happens, the current time minus this value is the safe point.
  tikvGCLifeTime: 720h

tests/actions.go

@@ -1818,7 +1818,6 @@ func (oa *operatorActions) DeployAdHocBackup(info *TidbClusterConfig) error {
  "user": "root",
  "password": info.Password,
  "storage.size": "10Gi",
- "backupOptions": "\"--verbose=3\"",
  "initialCommitTs": strings.TrimSpace(tsStr),
  }