Merge branch 'master' into brs3

charts/tidb-backup/values.yaml

@@ -27,7 +27,7 @@ name: fullbackup-{{ date "200601021504" .Release.Time }}
 image:
   pullPolicy: IfNotPresent
   # https://github.com/pingcap/tidb-cloud-backup
-  backup: pingcap/tidb-cloud-backup:20190828
+  backup: pingcap/tidb-cloud-backup:20191217
 
 # Add additional labels for backup/restore job's pod
 # ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
@@ -58,10 +58,10 @@ storage:
   size: 100Gi
 
 # -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.
+# -r is the chunk rows for each parallel dump thread to process, this is an option added in the pingcap's fork of mydumper
 # 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: "--compress-protocol -t 16 -F 256 --skip-tz-utc --verbose=3"
+backupOptions: "--compress-protocol -t 16 -r 10000  --skip-tz-utc --verbose=3"
 
 # Set the tidb_snapshot to be used for the backup
 # Use `show master status` to get the ts:

charts/tidb-cluster/values.yaml

@@ -675,7 +675,7 @@ binlog:
 scheduledBackup:
   create: false
   # https://github.com/pingcap/tidb-cloud-backup
-  mydumperImage: pingcap/tidb-cloud-backup:20190828
+  mydumperImage: pingcap/tidb-cloud-backup:20191217
   mydumperImagePullPolicy: IfNotPresent
   # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer.
   # different classes might map to quality-of-service levels, or to backup policies,
@@ -701,10 +701,10 @@ scheduledBackup:
   # https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/#handling-pod-and-container-failures
   restartPolicy: OnFailure
   # -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.
+  # -r is the chunk rows for each parallel dump thread to process, this is an option added in the pingcap's fork of mydumper
   # 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"
+  options: "-t 16 -r 10000 --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