From 90221c4f75b7e7d67cf0c9b4dacf9c0752efeb39 Mon Sep 17 00:00:00 2001 From: JoyinQ <56883733+Joyinqin@users.noreply.github.com> Date: Tue, 20 Apr 2021 14:26:07 +0800 Subject: [PATCH 1/2] cherry pick #5321 to release-4.0 Signed-off-by: ti-srebot --- br/backup-and-restore-storages.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/br/backup-and-restore-storages.md b/br/backup-and-restore-storages.md index c4587cfb4ef33..0e5792f2c1e29 100644 --- a/br/backup-and-restore-storages.md +++ b/br/backup-and-restore-storages.md @@ -41,6 +41,15 @@ Cloud storages such as S3 and GCS sometimes require additional configuration for -d 's3://my-bucket/sql-backup?region=us-west-2' ``` ++ Use TiDB Lightning to import data from S3 (using the path style in the request mode): + + {{< copyable "shell-regular" >}} + + ```bash + ./tidb-lightning --tidb-port=4000 --pd-urls=127.0.0.1:2379 --backend=local --sorted-kv-dir=/tmp/sorted-kvs \ + -d 's3://my-bucket/sql-backup?force-path-style=true&endpoint=http://10.154.10.132:8088' + ``` + + Use BR to back up data to GCS: {{< copyable "shell-regular" >}} From 794c71ad40fca3016404219a70ade22423413967 Mon Sep 17 00:00:00 2001 From: Joyinqin Date: Tue, 20 Apr 2021 15:14:06 +0800 Subject: [PATCH 2/2] Update backup-and-restore-storages.md --- br/backup-and-restore-storages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br/backup-and-restore-storages.md b/br/backup-and-restore-storages.md index 0e5792f2c1e29..6f2f23a86ae96 100644 --- a/br/backup-and-restore-storages.md +++ b/br/backup-and-restore-storages.md @@ -41,7 +41,7 @@ Cloud storages such as S3 and GCS sometimes require additional configuration for -d 's3://my-bucket/sql-backup?region=us-west-2' ``` -+ Use TiDB Lightning to import data from S3 (using the path style in the request mode): ++ Use TiDB Lightning to import data from S3 (using the path style in the request mode). If you are using TiDB v4.0.11 and earlier versions, you need to set `force-path-style=true` to use the path style in the request mode. {{< copyable "shell-regular" >}}