From 39ef462dfede6096e9fd2c2ed8a4818445e15886 Mon Sep 17 00:00:00 2001 From: Enwei Date: Wed, 25 Aug 2021 13:28:05 +0200 Subject: [PATCH 1/2] This is an automated cherry-pick of #6235 Signed-off-by: ti-chi-bot --- ticdc/manage-ticdc.md | 32 +++++++++++++++++++++++++++ tiup/tiup-component-dm-edit-config.md | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/ticdc/manage-ticdc.md b/ticdc/manage-ticdc.md index fd635ba571484..c27e9c8800ba5 100644 --- a/ticdc/manage-ticdc.md +++ b/ticdc/manage-ticdc.md @@ -25,6 +25,38 @@ tiup cluster upgrade v4.0.14 * The `changefeed` configuration has changed in TiCDC v4.0.2. See [Compatibility notes for the configuration file](/production-deployment-using-tiup.md#step-3-edit-the-initialization-configuration-file) for details. * If you encounter any issues, see [Upgrade TiDB using TiUP - FAQ](/upgrade-tidb-using-tiup.md#faq). +<<<<<<< HEAD +======= +## Modify TiCDC configuration using TiUP + +This section introduces how to modify the configuration of TiCDC cluster using the [`tiup cluster edit-config`](/tiup/tiup-component-cluster-edit-config.md) command of TiUP. The following example changes the value of `gc-ttl` from the default `86400` to `3600`, namely, one hour. + +First, execute the following command. You need to replace `` with your actual cluster name. + +{{< copyable "shell-regular" >}} + +```shell +tiup cluster edit-config +``` + +Then, enter the vi editor page and modify the `cdc` configuraion under [`server-configs`](/tiup/tiup-cluster-topology-reference.md#server_configs). The configuration is shown below: + +```shell + server_configs: + tidb: {} + tikv: {} + pd: {} + tiflash: {} + tiflash-learner: {} + pump: {} + drainer: {} + cdc: + gc-ttl: 3600 +``` + +After the modification, execute the `tiup cluster reload -R cdc` command to reload the configuration. + +>>>>>>> cdffc70a0 (fix typo: relaod -> reload (#6235)) ## Use TLS For details about using encrypted data transmission (TLS), see [Enable TLS Between TiDB Components](/enable-tls-between-components.md). diff --git a/tiup/tiup-component-dm-edit-config.md b/tiup/tiup-component-dm-edit-config.md index b2cd02bc55f46..30f48a84fb86b 100644 --- a/tiup/tiup-component-dm-edit-config.md +++ b/tiup/tiup-component-dm-edit-config.md @@ -9,7 +9,7 @@ If you need to modify the cluster service configuration after the cluster is dep > **Note:** > > + When you modify the configuration, you cannot add or delete machines. For how to add machines, see [Scale out a cluster](/tiup/tiup-component-dm-scale-out.md). For how to delete machines, see [Scale in a cluster](/tiup/tiup-component-dm-scale-in.md). -> + After you execute the `tiup dm edit-config` command, the configuration is modified only on the control machine. Then you need to execute the `tiup dm relaod` command to reload the configuration. +> + After you execute the `tiup dm edit-config` command, the configuration is modified only on the control machine. Then you need to execute the `tiup dm reload` command to reload the configuration. ## Syntax From ccc417d9c3167de98718260f6fc3717489163875 Mon Sep 17 00:00:00 2001 From: Enwei Date: Mon, 30 Aug 2021 10:27:49 +0200 Subject: [PATCH 2/2] fix cherry pick error --- ticdc/manage-ticdc.md | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/ticdc/manage-ticdc.md b/ticdc/manage-ticdc.md index c27e9c8800ba5..fd635ba571484 100644 --- a/ticdc/manage-ticdc.md +++ b/ticdc/manage-ticdc.md @@ -25,38 +25,6 @@ tiup cluster upgrade v4.0.14 * The `changefeed` configuration has changed in TiCDC v4.0.2. See [Compatibility notes for the configuration file](/production-deployment-using-tiup.md#step-3-edit-the-initialization-configuration-file) for details. * If you encounter any issues, see [Upgrade TiDB using TiUP - FAQ](/upgrade-tidb-using-tiup.md#faq). -<<<<<<< HEAD -======= -## Modify TiCDC configuration using TiUP - -This section introduces how to modify the configuration of TiCDC cluster using the [`tiup cluster edit-config`](/tiup/tiup-component-cluster-edit-config.md) command of TiUP. The following example changes the value of `gc-ttl` from the default `86400` to `3600`, namely, one hour. - -First, execute the following command. You need to replace `` with your actual cluster name. - -{{< copyable "shell-regular" >}} - -```shell -tiup cluster edit-config -``` - -Then, enter the vi editor page and modify the `cdc` configuraion under [`server-configs`](/tiup/tiup-cluster-topology-reference.md#server_configs). The configuration is shown below: - -```shell - server_configs: - tidb: {} - tikv: {} - pd: {} - tiflash: {} - tiflash-learner: {} - pump: {} - drainer: {} - cdc: - gc-ttl: 3600 -``` - -After the modification, execute the `tiup cluster reload -R cdc` command to reload the configuration. - ->>>>>>> cdffc70a0 (fix typo: relaod -> reload (#6235)) ## Use TLS For details about using encrypted data transmission (TLS), see [Enable TLS Between TiDB Components](/enable-tls-between-components.md).