empiredan commented on code in PR #64:
URL:
https://github.com/apache/incubator-pegasus-website/pull/64#discussion_r1464457846
##########
_docs/zh/administration/deployment.md:
##########
@@ -106,14 +105,14 @@ cd bin/
./pegasus_server config.ini -app_list collector
```
-集群启动成功后，会默认创建一个 `temp` 表，该表也用于 Collector 的集群可用度检查，最好不要删除。
-
-你可以使用 [Shell 工具](/overview/shell) 查看集群的各种状态。如果启动失败，可以到 `%{app.dir}/log`
内查看日志，排查问题。
+* 集群启动成功后，会默认创建一个 `temp` 表，该表也用于 Collector 的集群可用度检查。
+* 可以使用 [Shell 工具](/overview/shell) 查看集群的各种状态。
+* 如果启动失败，可以到 `%{app.dir}/log` 内查看日志，排查问题。
# 常见问题
-## 集群清理重建
+## 集群清理
如果想完全重新部署集群，**并清理所有数据**，需要清理以下环境，否则可能会出现启动新集群失败的问题：
* 清理 MetaServer，ReplicaServer 和 Collector 的 `%{app.dir}`，`%{slog.dir}` 和
`%{data.dirs}` 目录
Review Comment:
```suggestion
* 删除 MetaServer，ReplicaServer 和 Collector 的 `%{app.dir}`，`%{slog.dir}` 和
`%{data.dirs}` 目录
```
##########
_docs/en/administration/deployment.md:
##########
@@ -2,4 +2,117 @@
permalink: administration/deployment
---
-TRANSLATING
+# Prepare servers
+
+The Pegasus distributed cluster requires at least these servers to be prepared:
+* MetaServer: 2 or 3 servers, no SSD required.
+* ReplicaServer: At least 3 servers, it is recommended to mount SSD disks.
Multiple disks can improve the throughput capacity of a single node, and each
server should mount the same number and performance (e.g., IOPS, bandwidth and
R/W latency) of disks to ensure load balancing.
+* Collector: Optional role, 1 server, no SSD required. This process is mainly
used to collect and summarize cluster metrics, with a small load. It is
recommended to deploy it on one of the MetaServer servers.
+
+# Prepare Apache Zookeeper
+
+The Pegasus cluster relies on Zookeeper for metadata storage and MetaServer
leader election, therefore requiring a Zookeeper service.
+* It is recommended to deploy Zookeeper in the same server room as the Pegasus
cluster server.
+
+# Prepare configuration files
+
+Since 1.7.1, Pegasus has provided [configuration
file](https://github.com/apache/incubator-pegasus/blob/master/src/server/config.ini),
you need to modify the file to replace all variables in the form of `%{xxx}`
with appropriate values. As follows:
+
+| Variables | Description
| Example
|
+|---------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------|
+| %{cluster.name} | Cluster name. Indicator reporting labels that will be
used for collectors, etc
| my_cluster
|
+| %{home.dir} | Pegasus home path. It will store global configuration
files, such as disk blacklist configuration files
| /home/work
|
+| %{app.dir} | Program working path. The data files and log files
will be placed here by default
| /home/work/app/pegasus
|
+| %{slog.dir} | The path to store the shared-log files. It is
recommended to place it on an exclusive SSD drive. If there is no available SSD
disk, it can be set as an empty string, indicating that `%{app.dir}` is used by
default. Deprecate since version 2.6 |
/home/work/ssd1/pegasus |
+| %{data.dirs} | A list of paths to store user data, separated by
commas. Each path needs to be specified with a name in the format of
`name1:path1,name2:path2`. If there is no available SSD disk, it can be set as
an empty string, indicating that `%{app.dir}` is used by default |
ssd2:/home/work/ssd2/pegasus,ssd3:/home/work/ssd3/pegasus |
+| %{meta.server.list} | MetaServer address list, separated by commas. In the
format of `ip1:port1,ip2:port2`. **Note: Currently, only IP addresses are
supported and hostnames are not supported**
|
1.2.3.4:34601,1.2.3.5:34601 |
+| %{zk.server.list} | Zookeeper address list, separated by commas. In the
format of `ip1:port1,ip2:port2`
| 1.2.3.4:2181,1.2.3.5:2181
|
+
+> Please refer to the meaning of [configuration](/administration/config)。
+
+> Note: The same variable may appear in multiple places, so it is important to
ensure that all `%{xxx}` variables are replaced.
+
+## How to configure multiple SSD disks
+
+If there are multiple SSD disks, it is recommended to use one SSD disk
specifically for slog (i.e., shared-log) and the other disks to store user data
for each replicas.
+
+For example, suppose the server has 4 disks and the mounting path is
`/home/work/ssd{id}`, where {id}=1,2,3,4. So you can use ssd1 for slog, which
can be configured as follows:
+```ini
+[replication]
+ slog_dir = /home/work/ssd1/pegasus
+ data_dirs =
ssd2:/home/work/ssd2/pegasus,ssd3:/home/work/ssd3/pegasus,ssd4:/home/work/ssd4/pegasus
+```
+
+If there is only one SSD drive, then both slog and each replicas data share
this drive. Assuming the SSD disk mounting path is `/home/work/ssd`, it can be
configured as follows:
+```ini
+[replication]
+ slog_dir = /home/work/ssd/pegasus/{cluster.name}
+ data_dirs = ssd:/home/work/ssd/pegasus/{cluster.name}
+```
+
+## How to configure multiple network cards
+
+There is a section in the configuration file:
+```ini
+[network]
+ primary_interface =
+```
+Specify network card through `primary_interface`:
+* If there is only one network card, it can be set as an empty string to
automatically obtain the appropriate network card address. The specific
strategy is to search for the first address that complies with the
`10.\*.\*.\*/172.16.\*.\*/192.168.\*.\*` rule (i.e., the intranet address) in
the output list of the `ifconfig` command, which will ignore the loopback
address and virtual address.
+* If there are multiple network cards, please specify the network card name.
If not specified, the first address that complies with
`10.\*.\*.\*/172.16.\*.\*/192.168.\*.\*` rules will be used.
+
+For example, if there are multiple network cards and you want to use the
`eth2` network card, you can configure it as follows:
+```ini
+[network]
+ primary_interface = eth2
+```
+
+# Preparing to deploy packages
+
+The three roles of ReplicaServer, MetaServer, and Collector share the same
program binaries and configuration files.
+
+At first [build Pegasus](/overview/compilation). After building, run the
following command to package and generate a server-side deployment package:
+```
+./run.sh pack_server
+```
+After successful packed, a directory and a tar.gz package named
`pegasus-server-{version}-{gitSHA}-{platform}-{buildType}` will be generated in
the local path.
+There is a `bin/` directory that contains pegasus_server program binary and
dependency libraries, as well as the recently modified `config.ini` file.
+
+Copy the tar.gz package to the server that needs to be deployed and unzip it.
+
+# Start Service
+
+Before starting the server, it is necessary to add the path of the dynamic
link libraries that the program depends on to `LD_LIBRARY_PATH`:
+```
+export LD_LIBRARY_PATH=/path/to/your/pegasus/bin:$LD_LIBRARY_PATH
+```
+
+## Start MetaServer：
+```
+cd bin/
+./pegasus_server config.ini -app_list meta
+```
+
+## Start ReplicaServer：
+```
+cd bin/
+./pegasus_server config.ini -app_list replica
+```
+
+## Start Collector：
+```
+cd bin/
+./pegasus_server config.ini -app_list collector
+```
+
+* After the cluster is successfully started, a `temp` table will be created by
default, which is also used for the cluster availability detection by the
Collector.
+* Use [Shell tools](/overview/shell) to view various states of the cluster.
+* If the startup fails, you can check the logs in `%{app.dir}/log` to
troubleshoot the issue.
+
+# FAQ
+
+## Cluster cleaning
+
+If you want to completely redeploy the cluster and **clean up all data**, you
need to clean up the following environment, otherwise there may be issues when
starting a new cluster:
+* Clean up the `%{app.dir}`, `%{slog.dir}` and `%{data.dirs}` directories of
MetaServer，ReplicaServer and Collector
Review Comment:
```suggestion
* Remove the `%{app.dir}`, `%{slog.dir}` and `%{data.dirs}` directories of
MetaServer，ReplicaServer and Collector
```
##########
_docs/en/administration/deployment.md:
##########
@@ -2,4 +2,117 @@
permalink: administration/deployment
---
-TRANSLATING
+# Prepare servers
+
+The Pegasus distributed cluster requires at least these servers to be prepared:
+* MetaServer: 2 or 3 servers, no SSD required.
+* ReplicaServer: At least 3 servers, it is recommended to mount SSD disks.
Multiple disks can improve the throughput capacity of a single node, and each
server should mount the same number and performance (e.g., IOPS, bandwidth and
R/W latency) of disks to ensure load balancing.
+* Collector: Optional role, 1 server, no SSD required. This process is mainly
used to collect and summarize cluster metrics, with a small load. It is
recommended to deploy it on one of the MetaServer servers.
+
+# Prepare Apache Zookeeper
+
+The Pegasus cluster relies on Zookeeper for metadata storage and MetaServer
leader election, therefore requiring a Zookeeper service.
+* It is recommended to deploy Zookeeper in the same server room as the Pegasus
cluster server.
+
+# Prepare configuration files
+
+Since 1.7.1, Pegasus has provided [configuration
file](https://github.com/apache/incubator-pegasus/blob/master/src/server/config.ini),
you need to modify the file to replace all variables in the form of `%{xxx}`
with appropriate values. As follows:
+
+| Variables | Description
| Example
|
+|---------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------|
+| %{cluster.name} | Cluster name. Indicator reporting labels that will be
used for collectors, etc
| my_cluster
|
+| %{home.dir} | Pegasus home path. It will store global configuration
files, such as disk blacklist configuration files
| /home/work
|
+| %{app.dir} | Program working path. The data files and log files
will be placed here by default
| /home/work/app/pegasus
|
+| %{slog.dir} | The path to store the shared-log files. It is
recommended to place it on an exclusive SSD drive. If there is no available SSD
disk, it can be set as an empty string, indicating that `%{app.dir}` is used by
default. Deprecate since version 2.6 |
/home/work/ssd1/pegasus |
+| %{data.dirs} | A list of paths to store user data, separated by
commas. Each path needs to be specified with a name in the format of
`name1:path1,name2:path2`. If there is no available SSD disk, it can be set as
an empty string, indicating that `%{app.dir}` is used by default |
ssd2:/home/work/ssd2/pegasus,ssd3:/home/work/ssd3/pegasus |
+| %{meta.server.list} | MetaServer address list, separated by commas. In the
format of `ip1:port1,ip2:port2`. **Note: Currently, only IP addresses are
supported and hostnames are not supported**
|
1.2.3.4:34601,1.2.3.5:34601 |
+| %{zk.server.list} | Zookeeper address list, separated by commas. In the
format of `ip1:port1,ip2:port2`
| 1.2.3.4:2181,1.2.3.5:2181
|
+
+> Please refer to the meaning of [configuration](/administration/config)。
+
+> Note: The same variable may appear in multiple places, so it is important to
ensure that all `%{xxx}` variables are replaced.
+
+## How to configure multiple SSD disks
+
+If there are multiple SSD disks, it is recommended to use one SSD disk
specifically for slog (i.e., shared-log) and the other disks to store user data
for each replicas.
+
+For example, suppose the server has 4 disks and the mounting path is
`/home/work/ssd{id}`, where {id}=1,2,3,4. So you can use ssd1 for slog, which
can be configured as follows:
+```ini
+[replication]
+ slog_dir = /home/work/ssd1/pegasus
+ data_dirs =
ssd2:/home/work/ssd2/pegasus,ssd3:/home/work/ssd3/pegasus,ssd4:/home/work/ssd4/pegasus
+```
+
+If there is only one SSD drive, then both slog and each replicas data share
this drive. Assuming the SSD disk mounting path is `/home/work/ssd`, it can be
configured as follows:
+```ini
+[replication]
+ slog_dir = /home/work/ssd/pegasus/{cluster.name}
+ data_dirs = ssd:/home/work/ssd/pegasus/{cluster.name}
+```
+
+## How to configure multiple network cards
+
+There is a section in the configuration file:
+```ini
+[network]
+ primary_interface =
+```
+Specify network card through `primary_interface`:
+* If there is only one network card, it can be set as an empty string to
automatically obtain the appropriate network card address. The specific
strategy is to search for the first address that complies with the
`10.\*.\*.\*/172.16.\*.\*/192.168.\*.\*` rule (i.e., the intranet address) in
the output list of the `ifconfig` command, which will ignore the loopback
address and virtual address.
+* If there are multiple network cards, please specify the network card name.
If not specified, the first address that complies with
`10.\*.\*.\*/172.16.\*.\*/192.168.\*.\*` rules will be used.
+
+For example, if there are multiple network cards and you want to use the
`eth2` network card, you can configure it as follows:
+```ini
+[network]
+ primary_interface = eth2
+```
+
+# Preparing to deploy packages
+
+The three roles of ReplicaServer, MetaServer, and Collector share the same
program binaries and configuration files.
+
+At first [build Pegasus](/overview/compilation). After building, run the
following command to package and generate a server-side deployment package:
+```
+./run.sh pack_server
+```
+After successful packed, a directory and a tar.gz package named
`pegasus-server-{version}-{gitSHA}-{platform}-{buildType}` will be generated in
the local path.
+There is a `bin/` directory that contains pegasus_server program binary and
dependency libraries, as well as the recently modified `config.ini` file.
+
+Copy the tar.gz package to the server that needs to be deployed and unzip it.
+
+# Start Service
+
+Before starting the server, it is necessary to add the path of the dynamic
link libraries that the program depends on to `LD_LIBRARY_PATH`:
+```
+export LD_LIBRARY_PATH=/path/to/your/pegasus/bin:$LD_LIBRARY_PATH
+```
+
+## Start MetaServer：
+```
+cd bin/
+./pegasus_server config.ini -app_list meta
+```
+
+## Start ReplicaServer：
+```
+cd bin/
+./pegasus_server config.ini -app_list replica
+```
+
+## Start Collector：
+```
+cd bin/
+./pegasus_server config.ini -app_list collector
+```
+
+* After the cluster is successfully started, a `temp` table will be created by
default, which is also used for the cluster availability detection by the
Collector.
+* Use [Shell tools](/overview/shell) to view various states of the cluster.
+* If the startup fails, you can check the logs in `%{app.dir}/log` to
troubleshoot the issue.
+
+# FAQ
+
+## Cluster cleaning
+
+If you want to completely redeploy the cluster and **clean up all data**, you
need to clean up the following environment, otherwise there may be issues when
starting a new cluster:
+* Clean up the `%{app.dir}`, `%{slog.dir}` and `%{data.dirs}` directories of
MetaServer，ReplicaServer and Collector
+* Clean up the `%{cluster_root}` backpack path of Zookeeper
Review Comment:
```suggestion
* Remove the `%{cluster_root}` path of Zookeeper
```
##########
_docs/zh/administration/deployment.md:
##########
@@ -106,14 +105,14 @@ cd bin/
./pegasus_server config.ini -app_list collector
```
-集群启动成功后，会默认创建一个 `temp` 表，该表也用于 Collector 的集群可用度检查，最好不要删除。
-
-你可以使用 [Shell 工具](/overview/shell) 查看集群的各种状态。如果启动失败，可以到 `%{app.dir}/log`
内查看日志，排查问题。
+* 集群启动成功后，会默认创建一个 `temp` 表，该表也用于 Collector 的集群可用度检查。
+* 可以使用 [Shell 工具](/overview/shell) 查看集群的各种状态。
+* 如果启动失败，可以到 `%{app.dir}/log` 内查看日志，排查问题。
# 常见问题
-## 集群清理重建
+## 集群清理
如果想完全重新部署集群，**并清理所有数据**，需要清理以下环境，否则可能会出现启动新集群失败的问题：
* 清理 MetaServer，ReplicaServer 和 Collector 的 `%{app.dir}`，`%{slog.dir}` 和
`%{data.dirs}` 目录
-* 删除 Zookeeper 的 `/pegasus/%{cluster.name}` 节点
+* 删除 Zookeeper 的 `%{cluster_root}` 背包路径
Review Comment:
```suggestion
* 删除 Zookeeper 的 `%{cluster_root}` 路径
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
