From 18e93f3ccd0eeae2736dcf29f7fb627375e20332 Mon Sep 17 00:00:00 2001 From: Song Gao <2695690803@qq.com> Date: Mon, 30 Mar 2020 19:25:50 +0800 Subject: [PATCH 1/4] use tidb-lightning --- cmd/backup-manager/app/import/restore.go | 14 ++++++++------ images/tidb-backup-manager/Dockerfile | 11 +++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/cmd/backup-manager/app/import/restore.go b/cmd/backup-manager/app/import/restore.go index dfcee888c4..63501a5ea4 100644 --- a/cmd/backup-manager/app/import/restore.go +++ b/cmd/backup-manager/app/import/restore.go @@ -58,14 +58,16 @@ func (ro *Options) loadTidbClusterData(restorePath string) error { return fmt.Errorf("dir %s does not exist or is not a dir", restorePath) } args := []string{ - fmt.Sprintf("-d=%s", restorePath), - fmt.Sprintf("-h=%s", ro.Host), - fmt.Sprintf("-P=%d", ro.Port), - fmt.Sprintf("-u=%s", ro.User), - fmt.Sprintf("-p=%s", ro.Password), + "--status-addr=0.0.0.0:8289", + "--backend=tidb", + "--server-mode=false", + fmt.Sprintf("--tidb-user=%s", ro.User), + fmt.Sprintf("--tidb-password=%s", ro.Password), + fmt.Sprintf("--tidb-host=%s", ro.Host), + fmt.Sprintf("--d=%s", restorePath), } - output, err := exec.Command("/loader", args...).CombinedOutput() + output, err := exec.Command("/tidb-lightning", args...).CombinedOutput() if err != nil { return fmt.Errorf("cluster %s, execute loader command %v failed, output: %s, err: %v", ro, args, string(output), err) } diff --git a/images/tidb-backup-manager/Dockerfile b/images/tidb-backup-manager/Dockerfile index 17fdc3e216..83c5b39ac9 100644 --- a/images/tidb-backup-manager/Dockerfile +++ b/images/tidb-backup-manager/Dockerfile @@ -1,6 +1,7 @@ FROM pingcap/tidb-enterprise-tools:latest ARG VERSION=v1.51.0 ARG SHUSH_VERSION=v1.4.0 +ARG TOOLKIT_VERSION=v3.0.9 RUN apk update && apk add ca-certificates RUN wget -nv https://github.com/ncw/rclone/releases/download/${VERSION}/rclone-${VERSION}-linux-amd64.zip \ @@ -19,7 +20,17 @@ RUN wget -nv https://github.com/realestate-com-au/shush/releases/download/${SHUS && mv shush_linux_amd64 /usr/local/bin/shush \ && chmod 755 /usr/local/bin/shush +RUN \ + wget -nv https://download.pingcap.org/tidb-toolkit-${TOOLKIT_VERSION}-linux-amd64.tar.gz \ + && tar -xzf tidb-toolkit-${TOOLKIT_VERSION}-linux-amd64.tar.gz \ + && mv tidb-toolkit-${TOOLKIT_VERSION}-linux-amd64/bin/tidb-lightning /tidb-lightning \ + && mv tidb-toolkit-${TOOLKIT_VERSION}-linux-amd64/bin/tidb-lightning-ctl /tidb-lightning-ctl \ + && chmod 755 /tidb-lightning /tidb-lightning-ctl \ + && rm -rf tidb-toolkit-${TOOLKIT_VERSION}-linux-amd64.tar.gz \ + && rm -rf tidb-toolkit-${TOOLKIT_VERSION}-linux-amd64 + COPY bin/tidb-backup-manager /tidb-backup-manager COPY entrypoint.sh /entrypoint.sh + ENTRYPOINT ["/entrypoint.sh"] From bd48c8308a7051efacf24c7589442f0129736756 Mon Sep 17 00:00:00 2001 From: Song Gao <2695690803@qq.com> Date: Tue, 31 Mar 2020 13:34:26 +0800 Subject: [PATCH 2/4] Update restore.go --- cmd/backup-manager/app/import/restore.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/backup-manager/app/import/restore.go b/cmd/backup-manager/app/import/restore.go index 63501a5ea4..9ac07087ec 100644 --- a/cmd/backup-manager/app/import/restore.go +++ b/cmd/backup-manager/app/import/restore.go @@ -61,6 +61,7 @@ func (ro *Options) loadTidbClusterData(restorePath string) error { "--status-addr=0.0.0.0:8289", "--backend=tidb", "--server-mode=false", + "–log-file=", fmt.Sprintf("--tidb-user=%s", ro.User), fmt.Sprintf("--tidb-password=%s", ro.Password), fmt.Sprintf("--tidb-host=%s", ro.Host), From df7cc72dcc87ae12d8bd8d69772c989f3c1ff833 Mon Sep 17 00:00:00 2001 From: Song Gao Date: Tue, 31 Mar 2020 13:49:54 +0800 Subject: [PATCH 3/4] Update cmd/backup-manager/app/import/restore.go Co-Authored-By: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com> --- cmd/backup-manager/app/import/restore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/backup-manager/app/import/restore.go b/cmd/backup-manager/app/import/restore.go index 9ac07087ec..22c00511f5 100644 --- a/cmd/backup-manager/app/import/restore.go +++ b/cmd/backup-manager/app/import/restore.go @@ -61,7 +61,7 @@ func (ro *Options) loadTidbClusterData(restorePath string) error { "--status-addr=0.0.0.0:8289", "--backend=tidb", "--server-mode=false", - "–log-file=", + "–-log-file=", fmt.Sprintf("--tidb-user=%s", ro.User), fmt.Sprintf("--tidb-password=%s", ro.Password), fmt.Sprintf("--tidb-host=%s", ro.Host), From 493acd19f82a37bdb0c446e6eba9ffcb1d82251c Mon Sep 17 00:00:00 2001 From: Song Gao Date: Tue, 31 Mar 2020 13:50:00 +0800 Subject: [PATCH 4/4] Update images/tidb-backup-manager/Dockerfile Co-Authored-By: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com> --- images/tidb-backup-manager/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/tidb-backup-manager/Dockerfile b/images/tidb-backup-manager/Dockerfile index 83c5b39ac9..f69b0e6573 100644 --- a/images/tidb-backup-manager/Dockerfile +++ b/images/tidb-backup-manager/Dockerfile @@ -1,7 +1,7 @@ FROM pingcap/tidb-enterprise-tools:latest ARG VERSION=v1.51.0 ARG SHUSH_VERSION=v1.4.0 -ARG TOOLKIT_VERSION=v3.0.9 +ARG TOOLKIT_VERSION=v3.0.12 RUN apk update && apk add ca-certificates RUN wget -nv https://github.com/ncw/rclone/releases/download/${VERSION}/rclone-${VERSION}-linux-amd64.zip \