Skip to content

Commit

Permalink
configure-tidb-binlog-drainer: fix the nodeselector links (#311)
Browse files Browse the repository at this point in the history
  • Loading branch information
CaitinChen authored May 25, 2020
1 parent 6393439 commit 29eca23
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion en/configure-tidb-binlog-drainer.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The following table contains all configuration parameters available for the `tid
| `tlsCluster.enabled` | Whether or not to enable TLS between clusters | `false` |
| `config` | The configuration file passed to the drainer. Detailed reference: [drainer.toml](https://github.com/pingcap/tidb-binlog/blob/master/cmd/drainer/drainer.toml) | (see below) |
| `resources` | The resource limits and requests of the drainer Pod | `{}` |
| `nodeSelector` | Ensures that the drainer Pod is only scheduled to the node with the specific key-value pair as the label. Detailed reference: [nodeselector](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#nodeselector) | `{}` |
| `nodeSelector` | Ensures that the drainer Pod is only scheduled to the node with the specific key-value pair as the label. Detailed reference: [nodeselector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) | `{}` |
| `tolerations` | Applies to drainer Pods, allowing the Pods to be scheduled to the nodes with specified taints. Detailed reference: [taint-and-toleration](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration) | `{}` |
| `affinity` | Defines scheduling policies and preferences of the drainer Pod. Detailed reference:[affinity-and-anti-affinity](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#affinity-and-anti-affinity) | `{}` |

Expand Down
6 changes: 3 additions & 3 deletions en/tidb-cluster-chart-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ This document describes the configuration of the tidb-cluster chart.
| `pd.resources.requests.memory` | Memory resource request for each PD Pod | `nil` |
| `pd.resources.requests.storage` | Storage capacity request for each PD Pod | `1Gi` |
| `pd.affinity` | `pd.affinity` defines PD scheduling rules and preferences. For details, refer to [affinity-and-anti-affinity](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#affinity-and-anti-affinity) | `{}` |
| `pd.nodeSelector` | `pd.nodeSelector` makes sure that PD Pods are dispatched only to nodes that have this key-value pair as a label. For details, refer to [nodeselector](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#nodeselector) | `{}` |
| `pd.nodeSelector` | `pd.nodeSelector` makes sure that PD Pods are dispatched only to nodes that have this key-value pair as a label. For details, refer to [nodeselector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) | `{}` |
| `pd.tolerations` | `pd.tolerations` applies to PD Pods, allowing PD Pods to be dispatched to nodes with specified taints. For details, refer to [taint-and-toleration](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration) | `{}` |
| `pd.annotations` | Add specific `annotations` to PD Pods | `{}` |
| `tikv.config` | Configuration of TiKV in configuration file format. To view the default TiKV configuration file, refer to [`tikv/etc/config-template.toml`](https://github.com/tikv/tikv/blob/master/etc/config-template.toml) and select the tag of the corresponding TiKV version. To view the descriptions of parameters, refer to [TiKV configuration description](https://pingcap.com/docs/v3.0/reference/configuration/tikv-server/configuration-file/) and select the corresponding document version. Here you only need to modify the configuration according to the format in the configuration file.<br/><br/>The following two configuration items need to be configured explicitly:<br/><br/>`[storage.block-cache]`<br/>&nbsp;&nbsp;`shared = true`<br/>&nbsp;&nbsp;`capacity = "1GB"`<br/>Recommended: set `capacity` to 50% of `tikv.resources.limits.memory`<br/><br/>`[readpool.coprocessor]`<br/>&nbsp;&nbsp;`high-concurrency = 8`<br/>&nbsp;&nbsp;`normal-concurrency = 8`<br/>&nbsp;&nbsp;`low-concurrency = 8`<br/>Recommended: set to 80% of `tikv.resources.limits.cpu` | If the TiDB Operator version <= v1.0.0-beta.3, the default value is<br/>`nil`<br/>If the TiDB Operator version > v1.0.0-beta.3, the default value is<br/>`log-level = "info"`<br/>For example:<br/>&nbsp;&nbsp;`config:` \|<br/>&nbsp;&nbsp;&nbsp;&nbsp;`log-level = "info"` |
Expand All @@ -64,7 +64,7 @@ This document describes the configuration of the tidb-cluster chart.
| `tikv.resources.requests.memory` | Memory resource request for each TiKV Pod | `nil` |
| `tikv.resources.requests.storage` | Storage capacity request for each TiKV Pod | `10Gi` |
| `tikv.affinity` | `tikv.affinity` defines TiKV's scheduling rules and preferences. For details, refer to [affinity-and-anti-affinity](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#affinity-and-anti-affinity) | `{}` |
| `tikv.nodeSelector` | `tikv.nodeSelector` makes sure that TiKV Pods are dispatched only to nodes that have this key-value pair as a label. For details, refer to [nodeselector](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#nodeselector) | `{}` |
| `tikv.nodeSelector` | `tikv.nodeSelector` makes sure that TiKV Pods are dispatched only to nodes that have this key-value pair as a label. For details, refer to [nodeselector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) | `{}` |
| `tikv.tolerations` | `tikv.tolerations` applies to TiKV Pods, allowing TiKV Pods to be dispatched to nodes with specified taints. For details, refer to [taint-and-toleration](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration) | `{}` |
| `tikv.annotations` | Add specific `annotations` for TiKV Pods | `{}` |
| `tikv.defaultcfBlockCacheSize` | Specifies the block cache size. The block cache is used to cache uncompressed blocks. A large block cache setting can speed up reading. Generally it is recommended to set the block cache size to 30%-50% of `tikv.resources.limits.memory`<br/>If TiDB Operator version > v1.0.0-beta.3, configure in `tikv.config`:<br/>`[rocksdb.defaultcf]`<br/>`block-cache-size = "1GB"`<br/>Since TiKV v3.0.0, it is no longer necessary to configure `[rocksdb.defaultcf].block-cache-size` and `[rocksdb.writecf].block-cache-size`. Instead, you can configure `[storage.block-cache].capacity`. | `1GB` |
Expand All @@ -84,7 +84,7 @@ This document describes the configuration of the tidb-cluster chart.
| `tidb.passwordSecretName`| The name of the Secret which stores the TiDB username and password. This Secret can be created with the following command: `kubectl create secret generic tidb secret--from literal=root=${password}--namespace=${namespace}`. If the parameter is not set, the TiDB root password is empty. | `nil` |
| `tidb.initSql`| The initialization script that will be executed after the TiDB cluster is successfully started. | `nil` |
| `tidb.affinity` | `tidb.affinity` defines the scheduling rules and preferences of TiDB. For details, refer to [affinity-and-anti-affinity](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#affinity-and-anti-affinity). | `{}` |
| `tidb.nodeSelector` | `tidb.nodeSelector` makes sure that TiDB Pods are only dispatched to nodes that have this key-value pair as a label. For details, refer to[nodeselector](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#nodeselector). | `{}` |
| `tidb.nodeSelector` | `tidb.nodeSelector` makes sure that TiDB Pods are only dispatched to nodes that have this key-value pair as a label. For details, refer to[nodeselector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector). | `{}` |
| `tidb.tolerations` | `tidb.tolerations` applies to TiKV Pods, allowing TiKV Pods to be dispatched to nodes with specified taints. For details, refer to [taint-and-toleration](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration). | `{}` |
| `tidb.annotations` | Add specific `annotations` for TiDB Pods | `{}` |
| `tidb.maxFailoverCount` | The maximum number of failover in TiDB. If it is set to 3, then TiDB supports at most 3 instances failover at the same time. | `3` |
Expand Down
2 changes: 1 addition & 1 deletion zh/configure-tidb-binlog-drainer.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ category: reference
| `tlsCluster.enabled` | 是否开启集群间 TLS | `false` |
| `config` | 传递到 drainer 的配置文件。详情可参阅 [drainer.toml](https://github.com/pingcap/tidb-binlog/blob/master/cmd/drainer/drainer.toml) |(见下文)|
| `resources` | drainer Pod 的资源限制和请求 | `{}` |
| `nodeSelector` | 确保 drainer Pod 仅被调度到具有特定键值对作为标签的节点上。详情可参阅 [nodeselector](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#nodeselector) | `{}` |
| `nodeSelector` | 确保 drainer Pod 仅被调度到具有特定键值对作为标签的节点上。详情可参阅 [nodeselector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) | `{}` |
| `tolerations` | 适用于 drainer Pod,允许将 Pod 调度到有指定 taint 的节点上。详情可参阅 [taint-and-toleration](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration) | `{}` |
| `affinity` | 定义 drainer Pod 的调度策略和首选项。详情可参阅 [affinity-and-anti-affinity](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#affinity-and-anti-affinity) | `{}` |

Expand Down
6 changes: 3 additions & 3 deletions zh/tidb-cluster-chart-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ category: reference
| `pd.resources.requests.memory` | 每个 PD Pod 的内存资源请求 | `nil` |
| `pd.resources.requests.storage` | 每个 PD Pod 的存储容量请求 | `1Gi` |
| `pd.affinity` | `pd.affinity` 定义 PD 的调度规则和偏好,详细请参考:[affinity-and-anti-affinity](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#affinity-and-anti-affinity) | `{}` |
| `pd.nodeSelector` | `pd.nodeSelector` 确保 PD Pods 只调度到以该键值对作为标签的节点,详情参考:[nodeselector](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#nodeselector) | `{}` |
| `pd.nodeSelector` | `pd.nodeSelector` 确保 PD Pods 只调度到以该键值对作为标签的节点,详情参考:[nodeselector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) | `{}` |
| `pd.tolerations` | `pd.tolerations` 应用于 PD Pods,允许 PD Pods 调度到含有指定 taints 的节点上,详情参考:[taint-and-toleration](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration) | `{}` |
| `pd.annotations` | 为 PD Pods 添加特定的 `annotations` | `{}` |
| `tikv.config` | 配置文件格式的 TiKV 的配置,请参考 [`tikv/etc/config-template.toml`](https://github.com/tikv/tikv/blob/master/etc/config-template.toml) 查看默认 TiKV 配置文件(选择对应 TiKV 版本的 tag),可以参考 [TiKV 配置文件描述](https://pingcap.com/docs-cn/v3.0/reference/configuration/tikv-server/configuration-file/)查看配置参数的具体介绍(请选择对应的文档版本),这里只需要**按照配置文件中的格式修改配置**。<br/><br/>以下两个配置项需要显式配置:<br/><br/>`[storage.block-cache]`<br/>&nbsp;&nbsp;`shared = true`<br/>&nbsp;&nbsp;`capacity = "1GB"`<br/>推荐设置:`capacity` 设置为 `tikv.resources.limits.memory` 的 50%<br/><br/>`[readpool.coprocessor]`<br/>&nbsp;&nbsp;`high-concurrency = 8`<br/>&nbsp;&nbsp;`normal-concurrency = 8`<br/>&nbsp;&nbsp;`low-concurrency = 8`<br/>推荐设置:设置为 `tikv.resources.limits.cpu` 的 80%| TiDB Operator 版本 <= v1.0.0-beta.3,默认值为:<br/>`nil`<br/>TiDB Operator 版本 > v1.0.0-beta.3,默认值为:<br/>`log-level = "info"`<br/>配置示例:<br/>&nbsp;&nbsp;`config:` \|<br/>&nbsp;&nbsp;&nbsp;&nbsp;`log-level = "info"` |
Expand All @@ -64,7 +64,7 @@ category: reference
| `tikv.resources.requests.memory` | 每个 TiKV Pod 的内存资源请求 | `nil` |
| `tikv.resources.requests.storage` | 每个 TiKV Pod 的存储容量请求 | `10Gi` |
| `tikv.affinity` | `tikv.affinity` 定义 TiKV 的调度规则和偏好,详细请参考:[affinity-and-anti-affinity](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#affinity-and-anti-affinity) | `{}` |
| `tikv.nodeSelector` | `tikv.nodeSelector`确保 TiKV Pods 只调度到以该键值对作为标签的节点,详情参考:[nodeselector](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#nodeselector) | `{}` |
| `tikv.nodeSelector` | `tikv.nodeSelector`确保 TiKV Pods 只调度到以该键值对作为标签的节点,详情参考:[nodeselector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) | `{}` |
| `tikv.tolerations` | `tikv.tolerations` 应用于 TiKV Pods,允许 TiKV Pods 调度到含有指定 taints 的节点上,详情参考:[taint-and-toleration](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration) | `{}` |
| `tikv.annotations` | 为 TiKV Pods 添加特定的 `annotations` | `{}` |
| `tikv.defaultcfBlockCacheSize` | 指定 block 缓存大小,block 缓存用于缓存未压缩的 block,较大的 block 缓存设置可以加快读取速度。一般推荐设置为 `tikv.resources.limits.memory` 的 30%-50%<br/>如果 TiDB Operator 版本 > v1.0.0-beta.3,请通过 `tikv.config` 配置:<br/>`[rocksdb.defaultcf]`<br/>`block-cache-size = "1GB"`<br/>从 TiKV v3.0.0 开始,不再需要配置 `[rocksdb.defaultcf].block-cache-size``[rocksdb.writecf].block-cache-size`,改为配置 `[storage.block-cache].capacity` | `1GB` |
Expand All @@ -84,7 +84,7 @@ category: reference
| `tidb.passwordSecretName`| 存放 TiDB 用户名及密码的 Secret 的名字,该 Secret 可以使用以下命令创建机密:`kubectl create secret generic tidb secret--from literal=root=${password}--namespace=${namespace}`,如果没有设置,则 TiDB 根密码为空 | `nil` |
| `tidb.initSql`| 在 TiDB 集群启动成功后,会执行的初始化脚本 | `nil` |
| `tidb.affinity` | `tidb.affinity` 定义 TiDB 的调度规则和偏好,详细请参考:[affinity-and-anti-affinity](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#affinity-and-anti-affinity) | `{}` |
| `tidb.nodeSelector` | `tidb.nodeSelector`确保 TiDB Pods 只调度到以该键值对作为标签的节点,详情参考:[nodeselector](https://kubernetes.io/docs/concepts/configuration/assign-Pod-node/#nodeselector) | `{}` |
| `tidb.nodeSelector` | `tidb.nodeSelector`确保 TiDB Pods 只调度到以该键值对作为标签的节点,详情参考:[nodeselector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) | `{}` |
| `tidb.tolerations` | `tidb.tolerations` 应用于 TiDB Pods,允许 TiDB Pods 调度到含有指定 taints 的节点上,详情参考:[taint-and-toleration](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration) | `{}` |
| `tidb.annotations` | 为 TiDB Pods 添加特定的 `annotations` | `{}` |
| `tidb.maxFailoverCount` | TiDB 最大的故障转移数量,假设为 3 即最多支持同时 3 个 TiDB 实例故障转移 | `3` |
Expand Down

0 comments on commit 29eca23

Please sign in to comment.