From ce65546ca2fd6715e6a12a72993f952ee15aee0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Tue, 12 Mar 2024 13:23:35 +0100 Subject: [PATCH 1/7] DM: Update GitHub URLs for DM --- dm/deploy-a-dm-cluster-using-tiup-offline.md | 2 +- dm/deploy-a-dm-cluster-using-tiup.md | 2 +- dm/dm-error-handling.md | 2 +- dm/dm-faq.md | 4 ++-- dm/quick-start-with-dm.md | 2 +- dm/shard-merge-best-practices.md | 2 +- tidb-troubleshooting-map.md | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dm/deploy-a-dm-cluster-using-tiup-offline.md b/dm/deploy-a-dm-cluster-using-tiup-offline.md index 69c70e862bb88..5930e27ca9eea 100644 --- a/dm/deploy-a-dm-cluster-using-tiup-offline.md +++ b/dm/deploy-a-dm-cluster-using-tiup-offline.md @@ -127,7 +127,7 @@ alertmanager_servers: > > - Use `.` to indicate the subcategory of the configuration, such as `log.slow-threshold`. For more formats, see [TiUP configuration template](https://github.com/pingcap/tiup/blob/master/embed/examples/dm/topology.example.yaml). > -> - For more parameter description, see [master `config.toml.example`](https://github.com/pingcap/dm/blob/master/dm/master/dm-master.toml) and [worker `config.toml.example`](https://github.com/pingcap/dm/blob/master/dm/worker/dm-worker.toml). +> - For more parameter description, see [master `config.toml.example`](https://github.com/pingcap/tiflow/blob/master/dm/master/dm-master.toml) and [worker `config.toml.example`](https://github.com/pingcap/tiflow/blob/master/dm/worker/dm-worker.toml). > > - Make sure that the ports among the following components are interconnected: > - The `peer_port` (`8291` by default) among the DM-master nodes are interconnected. diff --git a/dm/deploy-a-dm-cluster-using-tiup.md b/dm/deploy-a-dm-cluster-using-tiup.md index 0463a84773214..17413e153ddc7 100644 --- a/dm/deploy-a-dm-cluster-using-tiup.md +++ b/dm/deploy-a-dm-cluster-using-tiup.md @@ -143,7 +143,7 @@ alertmanager_servers: > - The TiUP nodes can connect to the `port` of all DM-master nodes (`8261` by default). > - The TiUP nodes can connect to the `port` of all DM-worker nodes (`8262` by default). -For more `master_servers.host.config` parameter description, refer to [master parameter](https://github.com/pingcap/dm/blob/master/dm/master/dm-master.toml). For more `worker_servers.host.config` parameter description, refer to [worker parameter](https://github.com/pingcap/dm/blob/master/dm/worker/dm-worker.toml). +For more `master_servers.host.config` parameter description, refer to [master parameter](https://github.com/pingcap/tiflow/blob/master/dm/master/dm-master.toml). For more `worker_servers.host.config` parameter description, refer to [worker parameter](https://github.com/pingcap/tiflow/blob/master/dm/worker/dm-worker.toml). ## Step 3: Execute the deployment command diff --git a/dm/dm-error-handling.md b/dm/dm-error-handling.md index 603a1081f2a19..588d8833a6957 100644 --- a/dm/dm-error-handling.md +++ b/dm/dm-error-handling.md @@ -69,7 +69,7 @@ In the error system, usually, the information of a specific error is as follows: Whether DM outputs the error stack information depends on the error severity and the necessity. The error stack records the complete stack call information when the error occurs. If you cannot figure out the error cause based on the basic information and the error message, you can trace the execution path of the code when the error occurs using the error stack. -For the complete list of error codes, refer to the [error code lists](https://github.com/pingcap/dm/blob/master/_utils/terror_gen/errors_release.txt). +For the complete list of error codes, refer to the [error code lists](https://github.com/pingcap/tiflow/blob/master/_utils/terror_gen/errors_release.txt). ## Troubleshooting diff --git a/dm/dm-faq.md b/dm/dm-faq.md index 81f16584f16ac..5d426fdd696ca 100644 --- a/dm/dm-faq.md +++ b/dm/dm-faq.md @@ -24,7 +24,7 @@ Currently, DM does not support it and only supports the regular expressions of t ## If a statement executed upstream contains multiple DDL operations, does DM support such migration? -DM will attempt to split a single statement containing multiple DDL change operations into multiple statements containing only one DDL operation, but might not cover all cases. It is recommended to include only one DDL operation in a statement executed upstream, or verify it in the test environment. If it is not supported, you can file an [issue](https://github.com/pingcap/dm/issues) to the DM repository. +DM will attempt to split a single statement containing multiple DDL change operations into multiple statements containing only one DDL operation, but might not cover all cases. It is recommended to include only one DDL operation in a statement executed upstream, or verify it in the test environment. If it is not supported, you can file an [issue](https://github.com/pingcap/tiflow/issues) to the tiflow repository. ## How to handle incompatible DDL statements? @@ -54,7 +54,7 @@ When an exception occurs during data migration and the data migration task canno ## How to handle the error returned by the DDL operation related to the gh-ost table, after `online-ddl: true` is set? ``` -[unit=Sync] ["error information"="{\"msg\":\"[code=36046:class=sync-unit:scope=internal:level=high] online ddls on ghost table `xxx`.`_xxxx_gho`\\ngithub.com/pingcap/dm/pkg/terror.(*Error).Generate ...... +[unit=Sync] ["error information"="{\"msg\":\"[code=36046:class=sync-unit:scope=internal:level=high] online ddls on ghost table `xxx`.`_xxxx_gho`\\ngithub.com/pingcap/tiflow/pkg/terror.(*Error).Generate ...... ``` The above error can be caused by the following reason: diff --git a/dm/quick-start-with-dm.md b/dm/quick-start-with-dm.md index 4a4b6ba046777..f154be119ba4b 100644 --- a/dm/quick-start-with-dm.md +++ b/dm/quick-start-with-dm.md @@ -5,7 +5,7 @@ summary: Learn how to quickly deploy a DM cluster using binary packages. # Quick Start Guide for TiDB Data Migration -This document describes how to migrate data from MySQL to TiDB using [TiDB Data Migration](https://github.com/pingcap/dm) (DM). This guide is a quick demo of DM features and is not recommended for any production environment. +This document describes how to migrate data from MySQL to TiDB using [TiDB Data Migration](/dm/dm-overview.md) (DM). This guide is a quick demo of DM features and is not recommended for any production environment. ## Step 1: Deploy a DM cluster diff --git a/dm/shard-merge-best-practices.md b/dm/shard-merge-best-practices.md index 0b009751d8ae2..04bb21b8c510f 100644 --- a/dm/shard-merge-best-practices.md +++ b/dm/shard-merge-best-practices.md @@ -5,7 +5,7 @@ summary: Learn the best practices of data migration in the shard merge scenario. # Best Practices of Data Migration in the Shard Merge Scenario -This document describes the features and limitations of [TiDB Data Migration](https://github.com/pingcap/dm) (DM) in the shard merge scenario and provides a data migration best practice guide for your application (the default "pessimistic" mode is used). +This document describes the features and limitations of [TiDB Data Migration](/dm/dm-overview.md) (DM) in the shard merge scenario and provides a data migration best practice guide for your application (the default "pessimistic" mode is used). ## Use a separate data migration task diff --git a/tidb-troubleshooting-map.md b/tidb-troubleshooting-map.md index 82abc6b61b124..c30a54a6fe38a 100644 --- a/tidb-troubleshooting-map.md +++ b/tidb-troubleshooting-map.md @@ -471,7 +471,7 @@ Check the specific cause for busy by viewing the monitor **Grafana** -> **TiKV** ### 6.2 Data Migration -- 6.2.1 TiDB Data Migration (DM) is a migration tool that supports data migration from MySQL/MariaDB into TiDB. For details, see [DM on GitHub](https://github.com/pingcap/dm/). +- 6.2.1 TiDB Data Migration (DM) is a migration tool that supports data migration from MySQL/MariaDB into TiDB. For details, see [DM Overview](dm/dm-overview.md). - 6.2.2 `Access denied for user 'root'@'172.31.43.27' (using password: YES)` shows when you run `query status` or check the log. From c9acaa67b5609255c3349dd94995562abb71f434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Tue, 12 Mar 2024 13:28:43 +0100 Subject: [PATCH 2/7] Small correction --- dm/dm-error-handling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dm/dm-error-handling.md b/dm/dm-error-handling.md index 588d8833a6957..879498880e8ad 100644 --- a/dm/dm-error-handling.md +++ b/dm/dm-error-handling.md @@ -69,7 +69,7 @@ In the error system, usually, the information of a specific error is as follows: Whether DM outputs the error stack information depends on the error severity and the necessity. The error stack records the complete stack call information when the error occurs. If you cannot figure out the error cause based on the basic information and the error message, you can trace the execution path of the code when the error occurs using the error stack. -For the complete list of error codes, refer to the [error code lists](https://github.com/pingcap/tiflow/blob/master/_utils/terror_gen/errors_release.txt). +For the complete list of error codes, refer to the [error code lists](https://github.com/pingcap/tiflow/blob/master/dm/_utils/terror_gen/errors_release.txt). ## Troubleshooting From 3f2df4520f03e50e63a9475cfa3ad36c950beea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Wed, 13 Mar 2024 07:43:53 +0100 Subject: [PATCH 3/7] Update tidb-troubleshooting-map.md --- tidb-troubleshooting-map.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tidb-troubleshooting-map.md b/tidb-troubleshooting-map.md index c30a54a6fe38a..305436a5b5b80 100644 --- a/tidb-troubleshooting-map.md +++ b/tidb-troubleshooting-map.md @@ -471,7 +471,7 @@ Check the specific cause for busy by viewing the monitor **Grafana** -> **TiKV** ### 6.2 Data Migration -- 6.2.1 TiDB Data Migration (DM) is a migration tool that supports data migration from MySQL/MariaDB into TiDB. For details, see [DM Overview](dm/dm-overview.md). +- 6.2.1 TiDB Data Migration (DM) is a migration tool that supports data migration from MySQL/MariaDB into TiDB. For details, see [DM Overview](/dm/dm-overview.md). - 6.2.2 `Access denied for user 'root'@'172.31.43.27' (using password: YES)` shows when you run `query status` or check the log. From 1583a215f17f56151050890fd62d61fb45dc877e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Thu, 14 Mar 2024 09:43:03 +0100 Subject: [PATCH 4/7] Update dm/dm-faq.md Co-authored-by: Aolin --- dm/dm-faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dm/dm-faq.md b/dm/dm-faq.md index 5d426fdd696ca..63be918c2026b 100644 --- a/dm/dm-faq.md +++ b/dm/dm-faq.md @@ -24,7 +24,7 @@ Currently, DM does not support it and only supports the regular expressions of t ## If a statement executed upstream contains multiple DDL operations, does DM support such migration? -DM will attempt to split a single statement containing multiple DDL change operations into multiple statements containing only one DDL operation, but might not cover all cases. It is recommended to include only one DDL operation in a statement executed upstream, or verify it in the test environment. If it is not supported, you can file an [issue](https://github.com/pingcap/tiflow/issues) to the tiflow repository. +DM will attempt to split a single statement containing multiple DDL change operations into multiple statements containing only one DDL operation, but might not cover all cases. It is recommended to include only one DDL operation in a statement executed upstream, or verify it in the test environment. If it is not supported, you can file an [issue](https://github.com/pingcap/tiflow/issues) to the `pingcap/tiflow` repository. ## How to handle incompatible DDL statements? From 4984c168fa41400475144151265b727b6e7b794e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Thu, 14 Mar 2024 09:43:18 +0100 Subject: [PATCH 5/7] Update dm/shard-merge-best-practices.md Co-authored-by: Aolin --- dm/shard-merge-best-practices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dm/shard-merge-best-practices.md b/dm/shard-merge-best-practices.md index 04bb21b8c510f..7169d599e5358 100644 --- a/dm/shard-merge-best-practices.md +++ b/dm/shard-merge-best-practices.md @@ -5,7 +5,7 @@ summary: Learn the best practices of data migration in the shard merge scenario. # Best Practices of Data Migration in the Shard Merge Scenario -This document describes the features and limitations of [TiDB Data Migration](/dm/dm-overview.md) (DM) in the shard merge scenario and provides a data migration best practice guide for your application (the default "pessimistic" mode is used). +This document describes the features and limitations of [TiDB Data Migration (DM)](/dm/dm-overview.md) in the shard merge scenario and provides a data migration best practice guide for your application (the default "pessimistic" mode is used). ## Use a separate data migration task From b14a246d97daa457accd982c16dcb04ba64dab9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Thu, 14 Mar 2024 09:43:33 +0100 Subject: [PATCH 6/7] Update tidb-troubleshooting-map.md Co-authored-by: Aolin --- tidb-troubleshooting-map.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tidb-troubleshooting-map.md b/tidb-troubleshooting-map.md index 305436a5b5b80..04ec5ef415336 100644 --- a/tidb-troubleshooting-map.md +++ b/tidb-troubleshooting-map.md @@ -471,7 +471,7 @@ Check the specific cause for busy by viewing the monitor **Grafana** -> **TiKV** ### 6.2 Data Migration -- 6.2.1 TiDB Data Migration (DM) is a migration tool that supports data migration from MySQL/MariaDB into TiDB. For details, see [DM Overview](/dm/dm-overview.md). +- 6.2.1 TiDB Data Migration (DM) is a migration tool that supports data migration from MySQL/MariaDB into TiDB. For details, see [DM overview](/dm/dm-overview.md). - 6.2.2 `Access denied for user 'root'@'172.31.43.27' (using password: YES)` shows when you run `query status` or check the log. From 961783f78e6a98b4407f049bfb687254b5923671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Thu, 14 Mar 2024 09:43:54 +0100 Subject: [PATCH 7/7] Update dm/quick-start-with-dm.md Co-authored-by: Aolin --- dm/quick-start-with-dm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dm/quick-start-with-dm.md b/dm/quick-start-with-dm.md index f154be119ba4b..5c72afe9e04e6 100644 --- a/dm/quick-start-with-dm.md +++ b/dm/quick-start-with-dm.md @@ -5,7 +5,7 @@ summary: Learn how to quickly deploy a DM cluster using binary packages. # Quick Start Guide for TiDB Data Migration -This document describes how to migrate data from MySQL to TiDB using [TiDB Data Migration](/dm/dm-overview.md) (DM). This guide is a quick demo of DM features and is not recommended for any production environment. +This document describes how to migrate data from MySQL to TiDB using [TiDB Data Migration (DM)](/dm/dm-overview.md). This guide is a quick demo of DM features and is not recommended for any production environment. ## Step 1: Deploy a DM cluster