From ba2a65676b4055c296a499220e4c72f1c46b8b81 Mon Sep 17 00:00:00 2001 From: en-jin19 Date: Wed, 21 Jul 2021 21:53:18 +0200 Subject: [PATCH 1/2] Updated data dir in TiUP cluster file --- config-templates/complex-cdc.yaml | 5 ++++- tiup/tiup-cluster-topology-reference.md | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config-templates/complex-cdc.yaml b/config-templates/complex-cdc.yaml index 4f5b19244ba75..ed134593a6b6c 100644 --- a/config-templates/complex-cdc.yaml +++ b/config-templates/complex-cdc.yaml @@ -21,7 +21,7 @@ monitored: # # - PD: https://pingcap.com/docs/stable/reference/configuration/pd-server/configuration-file/ # # All configuration items use points to represent the hierarchy, e.g: # # readpool.storage.use-unified-pool -# # +# # # # You can overwrite this configuration via the instance-level `config` field. server_configs: @@ -96,14 +96,17 @@ cdc_servers: - host: 10.0.1.1 port: 8300 deploy_dir: "/tidb-deploy/cdc-8300" + data_dir: "/tidb-data/cdc-8300" log_dir: "/tidb-deploy/cdc-8300/log" - host: 10.0.1.2 port: 8300 deploy_dir: "/tidb-deploy/cdc-8300" + data_dir: "/tidb-data/cdc-8300" log_dir: "/tidb-deploy/cdc-8300/log" - host: 10.0.1.3 port: 8300 deploy_dir: "/tidb-deploy/cdc-8300" + data_dir: "/tidb-data/cdc-8300" log_dir: "/tidb-deploy/cdc-8300/log" monitoring_servers: diff --git a/tiup/tiup-cluster-topology-reference.md b/tiup/tiup-cluster-topology-reference.md index 8a4c90365cf13..795dbe68d1e1d 100644 --- a/tiup/tiup-cluster-topology-reference.md +++ b/tiup/tiup-cluster-topology-reference.md @@ -493,6 +493,8 @@ drainer_servers: - `deploy_dir`: Specifies the deployment directory. If it is not specified or specified as a relative directory, the directory is generated according to the `deploy_dir` directory configured in `global`. +- `data_dir`：Specifies the data directory. If it is not specified or specified as a relative directory, the directory is generated according to the `data_dir` directory configured in `global`. + - `log_dir`: Specifies the log directory. If it is not specified or specified as a relative directory, the log is generated according to the `log_dir` directory configured in `global`. - `gc-ttl`: The Time To Live (TTL) duration of the service level GC safepoint set by TiCDC in PD, in seconds. The default value is `86400`, which is 24 hours. @@ -514,6 +516,7 @@ For the above fields, you cannot modify these configured fields after the deploy - `host` - `port` - `deploy_dir` +- `data_dir` - `log_dir` - `gc-ttl` - `tz` From ad1a86fb67e0908dbb8d5941ae0e109a2f482c3d Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Fri, 23 Jul 2021 14:21:45 +0800 Subject: [PATCH 2/2] Update tiup/tiup-cluster-topology-reference.md --- tiup/tiup-cluster-topology-reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tiup/tiup-cluster-topology-reference.md b/tiup/tiup-cluster-topology-reference.md index 795dbe68d1e1d..70a3fbcd727a1 100644 --- a/tiup/tiup-cluster-topology-reference.md +++ b/tiup/tiup-cluster-topology-reference.md @@ -493,7 +493,7 @@ drainer_servers: - `deploy_dir`: Specifies the deployment directory. If it is not specified or specified as a relative directory, the directory is generated according to the `deploy_dir` directory configured in `global`. -- `data_dir`：Specifies the data directory. If it is not specified or specified as a relative directory, the directory is generated according to the `data_dir` directory configured in `global`. +- `data_dir`：Specifies the data directory. If it is not specified or specified as a relative directory, the directory is generated according to the `data_dir` directory configured in `global`. This field takes effect since v4.0.14. - `log_dir`: Specifies the log directory. If it is not specified or specified as a relative directory, the log is generated according to the `log_dir` directory configured in `global`.