Merge branch 'refactor-backup' of tennix.github.com:tennix/tidb-opera…

…tor into refactor-backup
pingcap · Mar 11, 2019 · f65f4eb · f65f4eb
2 parents e0e2436 + 6531290
commit f65f4eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/operation-guide.md b/docs/operation-guide.md
@@ -18,7 +18,7 @@ After TiDB Operator and Helm are deployed correctly, TiDB cluster can be deploye
 
 ```shell
 $ helm install charts/tidb-cluster --name=${releaseName} --namespace=${namespace}
-$ kubectl get po -n ${namespace} -l app.kubernetes.io/name=tidb-operator
+$ kubectl get po -n ${namespace} -l app.kubernetes.io/name=${releaseName}
 ```
 
 The default deployment doesn't set CPU and memory requests or limits for any of the pods, and the storage used is `local-storage` with minimal size. These settings can make TiDB cluster run on a small Kubernetes cluster like DinD or the default GKE cluster for testing. But for production deployment, you would likely to adjust the cpu, memory and storage resources according to the [recommendations](https://github.com/pingcap/docs/blob/master/op-guide/recommendation.md).

diff --git a/docs/setup.md b/docs/setup.md
@@ -26,13 +26,13 @@ TiDB Operator uses [PersistentVolume](https://kubernetes.io/docs/concepts/storag
 
 The Kubernetes cluster is suggested to enable [RBAC](https://kubernetes.io/docs/admin/authorization/rbac). Otherwise you may want to set `rbac.create` to `false` in the values.yaml of both tidb-operator and tidb-cluster charts.
 
-Because TiDB by default will use at most 40960 file descriptors, the [worker node](https://access.redhat.com/solutions/61334) and its Docker daemon's ulimit must be configured to greater than 40960:
+Because TiDB by default will use lots of file descriptors, the [worker node](https://access.redhat.com/solutions/61334) and its Docker daemon's ulimit must be configured to greater than 1048576:
 
 ```shell
 $ sudo vim /etc/systemd/system/docker.service
 ```
 
-Set `LimitNOFILE` to equal or greater than 40960.
+Set `LimitNOFILE` to equal or greater than 1048576.
 
 Otherwise you have to change TiKV's `max-open-files` to match your work node `ulimit -n` in the configuration file `charts/tidb-cluster/templates/config/_tikv-config.tpl`, but this will impact TiDB performance.