From e02c4e095f4459ca7a8e3ba42bda2587ad66e153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Wed, 22 Jan 2025 14:11:30 +0100 Subject: [PATCH 1/2] tiup: fix tiproxy data_dir --- config-templates/simple-tiproxy.yaml | 2 -- tiup/tiup-cluster-topology-reference.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/config-templates/simple-tiproxy.yaml b/config-templates/simple-tiproxy.yaml index e05afa98762a1..d70b096de1165 100644 --- a/config-templates/simple-tiproxy.yaml +++ b/config-templates/simple-tiproxy.yaml @@ -33,14 +33,12 @@ tikv_servers: tiproxy_servers: - host: 10.0.1.11 deploy_dir: "/tiproxy-deploy" - data_dir: "/tiproxy-data" port: 6000 status_port: 3080 config: labels: { zone: "east" } - host: 10.0.1.12 deploy_dir: "/tiproxy-deploy" - data_dir: "/tiproxy-data" port: 6000 status_port: 3080 config: diff --git a/tiup/tiup-cluster-topology-reference.md b/tiup/tiup-cluster-topology-reference.md index d57df126435c8..dd80c4bdbd7e7 100644 --- a/tiup/tiup-cluster-topology-reference.md +++ b/tiup/tiup-cluster-topology-reference.md @@ -439,8 +439,6 @@ tiflash_servers: - `deploy_dir`: Specifies the deployment directory. If it is not specified or specified as a relative directory, the directory is generated based on 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 based on the `data_dir` directory configured in `global`. - - `numa_node`: Allocates the NUMA policy to the instance. Before specifying this field, you need to make sure that the target machine has [numactl](https://linux.die.net/man/8/numactl) installed. If this field is specified, cpubind and membind policies are allocated using [numactl](https://linux.die.net/man/8/numactl). This field is of string type. The value is the ID of the NUMA node, such as `"0,1"`. - `config`: The configuration rule of this field is the same as the `tiproxy` configuration rule in `server_configs`. If this field is configured, the field content is merged with the `tiproxy` content in `server_configs`. If these two fields overlap, the content of this field takes effect. Subsequently, a configuration file is generated and sent to the machine specified in `host`. From 14e36a730f0f3eec79d09fb14cd988bc141a0bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Wed, 22 Jan 2025 14:15:56 +0100 Subject: [PATCH 2/2] fixup --- tiup/tiup-cluster-topology-reference.md | 1 - 1 file changed, 1 deletion(-) diff --git a/tiup/tiup-cluster-topology-reference.md b/tiup/tiup-cluster-topology-reference.md index dd80c4bdbd7e7..64ea2b63e9500 100644 --- a/tiup/tiup-cluster-topology-reference.md +++ b/tiup/tiup-cluster-topology-reference.md @@ -452,7 +452,6 @@ Among the above fields, you cannot modify the following configured fields after - `host` - `port` - `deploy_dir` -- `data_dir` - `arch` - `os`