From b4e89722f6c409f30946758765946d1fb958185a Mon Sep 17 00:00:00 2001 From: yikeke Date: Tue, 23 Jun 2020 21:27:47 +0800 Subject: [PATCH 1/3] update tiflash configs --- production-deployment-using-tiup.md | 1 + tiflash/maintain-tiflash.md | 2 +- tiflash/tiflash-configuration.md | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/production-deployment-using-tiup.md b/production-deployment-using-tiup.md index a22da4f75cfc5..d1b5f65694174 100644 --- a/production-deployment-using-tiup.md +++ b/production-deployment-using-tiup.md @@ -204,3 +204,4 @@ If you have deployed [TiFlash](/tiflash/tiflash-overview.md) along with the TiDB If you have deployed [TiCDC](/ticdc/ticdc-overview.md) along with the TiDB cluster, see the following documents: - [Manage TiCDC Cluster and Replication Tasks](/ticdc/manage-ticdc.md) +- [Troubleshoot TiCDC](/ticdc/troubleshoot-ticdc.md) \ No newline at end of file diff --git a/tiflash/maintain-tiflash.md b/tiflash/maintain-tiflash.md index 061a47f20694b..bc8be1816a8da 100644 --- a/tiflash/maintain-tiflash.md +++ b/tiflash/maintain-tiflash.md @@ -7,7 +7,7 @@ aliases: ['/docs/dev/reference/tiflash/maintain/'] # Maintain a TiFlash Cluster -This document describes how to perform common operations when you maintain a TiFlash cluster, including checking the TiFlash version. This document also introduces critical logs and a system table of TiFlash. +This document describes how to perform common operations when you maintain a [TiFlash](/tiflash/tiflash-overview.md) cluster, including checking the TiFlash version. This document also introduces critical logs and a system table of TiFlash. ## Check the TiFlash version diff --git a/tiflash/tiflash-configuration.md b/tiflash/tiflash-configuration.md index 6e945ae28c247..c848716782687 100644 --- a/tiflash/tiflash-configuration.md +++ b/tiflash/tiflash-configuration.md @@ -78,7 +78,8 @@ Multiple TiFlash nodes elect a master to add or delete placement rules to PD, an [profiles] [profiles.default] dt_enable_logical_split = true # The default value is `true`. This parameter determines whether the segment of DeltaTree Storage Engine uses logical split. Using the logical split can reduce the write amplification, and improve the write speed. However, these are at the cost of disk space waste. - max_memory_usage_for_all_queries = 0 # The memory usage limit of the generated intermediate data when queries are executed. The default value is `0` (in bytes), which means no limit. + max_memory_usage = 10000000000 # The memory usage limit of the generated intermediate data when a single coprocessor query is executed. The default value is 10,000,000,000 (in bytes). If set to 0, it means no limit. + max_memory_usage_for_all_queries = 0 # The memory usage limit of the generated intermediate data when all queries are executed. The default value is `0` (in bytes), which means no limit. ``` ### Configure the `tiflash-learner.toml` file From f77409e04f20d8e3ad0a49c4d3293bc4c34b8e1b Mon Sep 17 00:00:00 2001 From: yikeke Date: Tue, 23 Jun 2020 21:35:02 +0800 Subject: [PATCH 2/3] align a link from https://github.com/pingcap/docs-cn/pull/3341 --- ticdc/manage-ticdc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ticdc/manage-ticdc.md b/ticdc/manage-ticdc.md index 8ced4e29a4dff..2055c1e001309 100644 --- a/ticdc/manage-ticdc.md +++ b/ticdc/manage-ticdc.md @@ -28,7 +28,7 @@ For details, refer to [Deploy a TiDB Cluster Using TiUP](/production-deployment- 1. First, make sure that the current TiDB version supports TiCDC; otherwise, you need to upgrade the TiDB cluster to `v4.0.0 rc.1` or later versions. -2. To deploy TiCDC, refer to [Scale out a TiDB/TiKV/PD/TiCDC node](/scale-tidb-using-tiup.md#scale-out-a-tidbtikvpdticdc-node). +2. To deploy TiCDC, refer to [Scale out a TiCDC node](/scale-tidb-using-tiup.md#scale-out-a-ticdc-node). ### Use Binary From 6e7cad181f12f6c074311cbd4fcd3636aa9a1624 Mon Sep 17 00:00:00 2001 From: Keke Yi <40977455+yikeke@users.noreply.github.com> Date: Sun, 28 Jun 2020 10:18:24 +0800 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com> --- tiflash/tiflash-configuration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tiflash/tiflash-configuration.md b/tiflash/tiflash-configuration.md index c848716782687..b81cd608a750d 100644 --- a/tiflash/tiflash-configuration.md +++ b/tiflash/tiflash-configuration.md @@ -78,8 +78,8 @@ Multiple TiFlash nodes elect a master to add or delete placement rules to PD, an [profiles] [profiles.default] dt_enable_logical_split = true # The default value is `true`. This parameter determines whether the segment of DeltaTree Storage Engine uses logical split. Using the logical split can reduce the write amplification, and improve the write speed. However, these are at the cost of disk space waste. - max_memory_usage = 10000000000 # The memory usage limit of the generated intermediate data when a single coprocessor query is executed. The default value is 10,000,000,000 (in bytes). If set to 0, it means no limit. - max_memory_usage_for_all_queries = 0 # The memory usage limit of the generated intermediate data when all queries are executed. The default value is `0` (in bytes), which means no limit. + max_memory_usage = 10000000000 # The memory usage limit for the generated intermediate data when a single coprocessor query is executed. The default value is 10,000,000,000 (in bytes). If set to 0, it means no limit. + max_memory_usage_for_all_queries = 0 # The memory usage limit for the generated intermediate data when all queries are executed. The default value is 0 (in bytes), which means no limit. ``` ### Configure the `tiflash-learner.toml` file