From fefd0dabc02c396de1680d31638c0b211003c1d5 Mon Sep 17 00:00:00 2001 From: Frank945946 Date: Thu, 19 Oct 2023 16:14:05 +0800 Subject: [PATCH 1/2] deprecated-tikv-importer-in-operator --- en/restore-data-using-tidb-lightning.md | 8 +------- en/tidb-toolkit.md | 2 -- zh/restore-data-using-tidb-lightning.md | 8 +------- zh/tidb-toolkit.md | 2 -- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/en/restore-data-using-tidb-lightning.md b/en/restore-data-using-tidb-lightning.md index d073ec1e62..7a6b8e5e87 100644 --- a/en/restore-data-using-tidb-lightning.md +++ b/en/restore-data-using-tidb-lightning.md @@ -8,16 +8,10 @@ aliases: ['/docs/tidb-in-kubernetes/dev/restore-data-using-tidb-lightning/'] This document describes how to import data into a TiDB cluster on Kubernetes using [TiDB Lightning](https://docs.pingcap.com/tidb/stable/tidb-lightning-overview). -TiDB Lightning contains two components: tidb-lightning and tikv-importer. In Kubernetes, the tikv-importer is inside the separate Helm chart of the TiDB cluster. And tikv-importer is deployed as a `StatefulSet` with `replicas=1` while tidb-lightning is in a separate Helm chart and deployed as a `Job`. +In Kubernetes, the tidb-lightning is in a separate Helm chart and deployed as a `Job`. TiDB Lightning supports three backends: `Importer-backend`, `Local-backend`, and `TiDB-backend`. For the differences of these backends and how to choose backends, see [TiDB Lightning Backends](https://docs.pingcap.com/tidb/stable/tidb-lightning-backends). -- For `Importer-backend`, both tikv-importer and tidb-lightning need to be deployed. - - > **Note:** - > - > `Importer-backend` is deprecated in TiDB 5.3 version or later versions. If you must use `Importer-backend`, refer to [the documentation of v1.2](https://docs.pingcap.com/tidb-in-kubernetes/v1.2/restore-data-using-tidb-lightning#deploy-tikv-importer). - - For `Local-backend`, only tidb-lightning needs to be deployed. - For `TiDB-backend`, only tidb-lightning needs to be deployed, and it is recommended to import data using CustomResourceDefinition (CRD) in TiDB Operator v1.1 and later versions. For details, refer to [Restore Data from GCS Using TiDB Lightning](restore-from-gcs.md) or [Restore Data from S3-Compatible Storage Using TiDB Lightning](restore-from-s3.md) diff --git a/en/tidb-toolkit.md b/en/tidb-toolkit.md index acc90bcdd3..21be7256a7 100644 --- a/en/tidb-toolkit.md +++ b/en/tidb-toolkit.md @@ -181,7 +181,6 @@ Kubernetes applications are packed as charts in Helm. PingCAP provides the follo * `tidb-backup`: used to back up or restore TiDB clusters; * `tidb-lightning`: used to import data into a TiDB cluster; * `tidb-drainer`: used to deploy TiDB Drainer; -* `tikv-importer`: used to deploy TiKV Importer. These charts are hosted in the Helm chart repository `https://charts.pingcap.org/` maintained by PingCAP. You can add this repository to your local server or computer using the following command: @@ -206,7 +205,6 @@ pingcap/tidb-cluster v1.5.0 A Helm chart for TiDB Cl pingcap/tidb-drainer v1.5.0 A Helm chart for TiDB Binlog drainer. pingcap/tidb-lightning v1.5.0 A Helm chart for TiDB Lightning pingcap/tidb-operator v1.5.0 v1.5.0 tidb-operator Helm chart for Kubernetes -pingcap/tikv-importer v1.5.0 A Helm chart for TiKV Importer ``` When a new version of chart has been released, you can use `helm repo update` to update the repository cached locally: diff --git a/zh/restore-data-using-tidb-lightning.md b/zh/restore-data-using-tidb-lightning.md index af9416ecb5..f486e99212 100644 --- a/zh/restore-data-using-tidb-lightning.md +++ b/zh/restore-data-using-tidb-lightning.md @@ -8,16 +8,10 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/restore-data-using-tidb-lightning/'] 本文介绍了如何使用 [TiDB Lightning](https://docs.pingcap.com/zh/tidb/stable/tidb-lightning-overview) 导入集群数据。 -TiDB Lightning 包含两个组件：tidb-lightning 和 tikv-importer。在 Kubernetes 上，tikv-importer 位于单独的 Helm chart 内，被部署为一个副本数为 1 (`replicas=1`) 的 `StatefulSet`；tidb-lightning 位于单独的 Helm chart 内，被部署为一个 `Job`。 +TiDB Lightning 位于单独的 Helm chart 内，被部署为一个 `Job`。 目前，TiDB Lightning 支持三种后端：`Importer-backend`、`Local-backend` 、`TiDB-backend`。关于这三种后端的区别和选择，请参阅 [TiDB Lightning 文档](https://docs.pingcap.com/zh/tidb/stable/tidb-lightning-backends)。 -- 对于 `Importer-backend` 后端，需要分别部署 tikv-importer 与 tidb-lightning。 - - > **注意：** - > - > `Importer-backend` 后端在 TiDB 5.3 及之后的版本被废弃。如果必须使用 `Importer-backend` 后端，请参考 v1.2 及以前的[旧版文档](https://docs.pingcap.com/zh/tidb-in-kubernetes/v1.2/restore-data-using-tidb-lightning#部署-tikv-importer)部署 tikv-importer。 - - 对于 `Local-backend` 后端，只需要部署 tidb-lightning。 - 对于 `TiDB-backend` 后端，只需要部署 tidb-lightning。推荐使用基于 TiDB Operator 新版（v1.1 及以上）的 CustomResourceDefinition (CRD) 实现。具体信息可参考[使用 TiDB Lightning 恢复 GCS 上的备份数据](restore-from-gcs.md)或[使用 TiDB Lightning 恢复 S3 兼容存储上的备份数据](restore-from-s3.md)。 diff --git a/zh/tidb-toolkit.md b/zh/tidb-toolkit.md index 118e725474..2576a5b29d 100644 --- a/zh/tidb-toolkit.md +++ b/zh/tidb-toolkit.md @@ -181,7 +181,6 @@ Kubernetes 应用在 Helm 中被打包为 chart。PingCAP 针对 Kubernetes 上 * `tidb-backup`：用于 TiDB 集群备份恢复； * `tidb-lightning`：用于 TiDB 集群导入数据； * `tidb-drainer`：用于部署 TiDB Drainer； -* `tikv-importer`：用于部署 TiKV Importer； 这些 chart 都托管在 PingCAP 维护的 helm chart 仓库 `https://charts.pingcap.org/` 中，你可以通过下面的命令添加该仓库： @@ -206,7 +205,6 @@ pingcap/tidb-cluster v1.5.0 A Helm chart for TiDB Cl pingcap/tidb-drainer v1.5.0 A Helm chart for TiDB Binlog drainer. pingcap/tidb-lightning v1.5.0 A Helm chart for TiDB Lightning pingcap/tidb-operator v1.5.0 v1.5.0 tidb-operator Helm chart for Kubernetes -pingcap/tikv-importer v1.5.0 A Helm chart for TiKV Importer ``` 当新版本的 chart 发布后，你可以使用 `helm repo update` 命令更新本地对于仓库的缓存： From 28a3e6d225c48bec5634e66f37fab6b27c5eaecf Mon Sep 17 00:00:00 2001 From: Aolin Date: Thu, 26 Oct 2023 13:51:50 +0800 Subject: [PATCH 2/2] Apply suggestions from code review --- en/restore-data-using-tidb-lightning.md | 2 +- zh/restore-data-using-tidb-lightning.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/restore-data-using-tidb-lightning.md b/en/restore-data-using-tidb-lightning.md index 7a6b8e5e87..f62753e67c 100644 --- a/en/restore-data-using-tidb-lightning.md +++ b/en/restore-data-using-tidb-lightning.md @@ -10,7 +10,7 @@ This document describes how to import data into a TiDB cluster on Kubernetes usi In Kubernetes, the tidb-lightning is in a separate Helm chart and deployed as a `Job`. -TiDB Lightning supports three backends: `Importer-backend`, `Local-backend`, and `TiDB-backend`. For the differences of these backends and how to choose backends, see [TiDB Lightning Backends](https://docs.pingcap.com/tidb/stable/tidb-lightning-backends). +TiDB Lightning supports two backends: `Local-backend`, and `TiDB-backend`. For the differences of these backends and how to choose backends, see [TiDB Lightning Backends](https://docs.pingcap.com/tidb/stable/tidb-lightning-backends). - For `Local-backend`, only tidb-lightning needs to be deployed. diff --git a/zh/restore-data-using-tidb-lightning.md b/zh/restore-data-using-tidb-lightning.md index f486e99212..67f756479f 100644 --- a/zh/restore-data-using-tidb-lightning.md +++ b/zh/restore-data-using-tidb-lightning.md @@ -10,7 +10,7 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/restore-data-using-tidb-lightning/'] TiDB Lightning 位于单独的 Helm chart 内，被部署为一个 `Job`。 -目前，TiDB Lightning 支持三种后端：`Importer-backend`、`Local-backend` 、`TiDB-backend`。关于这三种后端的区别和选择，请参阅 [TiDB Lightning 文档](https://docs.pingcap.com/zh/tidb/stable/tidb-lightning-backends)。 +目前，TiDB Lightning 支持两种后端：`Local-backend` 和 `TiDB-backend`。关于这两种后端的区别和选择，请参阅 [TiDB Lightning 文档](https://docs.pingcap.com/zh/tidb/stable/tidb-lightning-backends)。 - 对于 `Local-backend` 后端，只需要部署 tidb-lightning。