From 6226c8ccfbb5967539432b669df2256018722c29 Mon Sep 17 00:00:00 2001 From: Keke Yi <40977455+yikeke@users.noreply.github.com> Date: Sun, 28 Jun 2020 10:23:08 +0800 Subject: [PATCH] cherry pick #3005 to release-4.0 Signed-off-by: ti-srebot --- production-deployment-using-tiup.md | 1 + ticdc/manage-ticdc.md | 2 +- tiflash/maintain-tiflash.md | 2 +- tiflash/tiflash-configuration.md | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/production-deployment-using-tiup.md b/production-deployment-using-tiup.md index 3693b952fc14b..2befe7c4111fd 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) diff --git a/ticdc/manage-ticdc.md b/ticdc/manage-ticdc.md index e9bddc47af137..ce41a9735f22f 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 diff --git a/tiflash/maintain-tiflash.md b/tiflash/maintain-tiflash.md index c04aebcb8114b..06136c1f5fe27 100644 --- a/tiflash/maintain-tiflash.md +++ b/tiflash/maintain-tiflash.md @@ -7,7 +7,7 @@ aliases: ['/docs/stable/tiflash/maintain-tiflash/','/docs/v4.0/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 544524c48037e..7b9bdd591bef8 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 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