Skip to content

Commit

Permalink
fix some typos
Browse files Browse the repository at this point in the history
Signed-off-by: cui fliter <[email protected]>
  • Loading branch information
cuishuang authored and ilixiaocui committed Oct 18, 2022
1 parent dfa5219 commit 774808a
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions docs/cn/CurveBS写时延优化.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ CSErrorCode CSChunkFile::Open(bool createFile) {
// But the current operation of the same chunk is serial, this problem
// will not occur
if (rc != 0 && rc != -EEXIST) {
LOG(ERROR) << "Error occured when create file."
LOG(ERROR) << "Error occurred when create file."
<< " filepath = " << chunkFilePath;
return CSErrorCode::InternalError;
}
}
int rc = lfs_->Open(chunkFilePath, O_RDWR|O_NOATIME|O_DSYNC);
if (rc < 0) {
LOG(ERROR) << "Error occured when opening file."
LOG(ERROR) << "Error occurred when opening file."
<< " filepath = " << chunkFilePath;
return CSErrorCode::InternalError;
}
Expand Down
2 changes: 1 addition & 1 deletion docs/cn/curvefs_volume_space_design.md
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ message StatSpaceRequest {
message SpaceInfo {
required uint64 size = 1;
required uint64 used = 2;
required uint64 avilable = 3;
required uint64 available = 3;
}

message StatSpaceResponse {
Expand Down
2 changes: 1 addition & 1 deletion docs/cn/monitor.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ CURVE 集群监控使用 Prometheus 采集数据,并使用 Grafana 作为前

1. ```Promethethus``` 定时从 MDS、ETCD、Snapshotcloneserver、ChunkServer、Client 中的 Brpc Server 拉取相应的数据

2. ```docker compose``` 用于编排docker组件的配置,包括 Promethues、Grafana、Repoter
2. ```docker compose``` 用于编排docker组件的配置,包括 Prometheus、Grafana、Repoter

3. ```python``` 脚本有多个。[target_json.py ](../../monitor/target_json.py)用于生成 prometheus 服务发现依赖的监控目标配置,生成的文件为 json 格式;该脚本依赖 [target.ini](../../monitor/target.ini) 中的配置,从配置中获取 mds、etcd 的信息。[grafana-report.py](../../monitor/grafana-report.py) 用于从 Grafana 导出 daily reporter中所需要的数据信息。

Expand Down
4 changes: 2 additions & 2 deletions docs/cn/quality.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ curve包括了不同层级的测试,是为了更快速的检验新引入功能

严格的代码依赖于两部分:

1. code review。这个使用的是gerrit平台,两个code review+1,ci+1代码才能合入。code reveiw是代码提交中非常依赖于人工的环节,但是这一环境也很重要,对代码的可读性会有比较高的要求。
2. CI。这个主要对接的是jekins,也得益于异常测试的自动化,代码合入之前需要跑过单元测试、集成测试、异常测试,很大程度上减少了低级bug的出现。
1. code review。这个使用的是gerrit平台,两个code review+1,ci+1代码才能合入。code review是代码提交中非常依赖于人工的环节,但是这一环境也很重要,对代码的可读性会有比较高的要求。
2. CI。这个主要对接的是jenkins,也得益于异常测试的自动化,代码合入之前需要跑过单元测试、集成测试、异常测试,很大程度上减少了低级bug的出现。

定时的ci触发:

Expand Down
4 changes: 2 additions & 2 deletions docs/en/mds_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ Figure 3 below shows the relation between segment and chunk:
<font size=3> Figure 3: Relation between segment and chunk</font>
</p>

Namespace info is rather intuitive, which is the hierachy of files:
Namespace info is rather intuitive, which is the hierarchy of files:

<p align="center">
<img src="../images/mds-nameserver.png" alt="mds-nameserver.png" width="700"><br>
<font size=3> Figure 4: Example of namespace data and operations </font>
</p>

Figure 4 illustrates how namespace info is stored in form of KV pairs. The key consists of parent directory ID and target name (seperated by a '/'), and the value is the ID of the target file. In this way we struck a great balance between the workload of some of the operations we implemented:
Figure 4 illustrates how namespace info is stored in form of KV pairs. The key consists of parent directory ID and target name (separated by a '/'), and the value is the ID of the target file. In this way we struck a great balance between the workload of some of the operations we implemented:

1. List: List all file and directories under a certain directory.
2. Find: Find a specific file under a location
Expand Down
2 changes: 1 addition & 1 deletion docs/en/monitor_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ The configuration of the monitoring target uses the prometheus file-based servic

1. ```Promethethus``` regularly pulls corresponding data from Brpc Server in MDS, ETCD, Snapshotcloneserver, ChunkServer, and Client.

2. ```docker compose``` is used to orchestrate the configuration of docker components, including Promethues, Grafana and Repoter.
2. ```docker compose``` is used to orchestrate the configuration of docker components, including Prometheus, Grafana and Repoter.

3. ```python``` scripts. [target_json.py](../../monitor/target_json.py) is used to generate the monitoring target configuration that prometheus service discovery depends on. The generated file is in json format and the script depends on [target.ini](../../monitor/target.ini) to obtain mds, etcd information from the configuration. [grafana-report.py](../../monitor/grafana-report.py) is used to export the data information required by the daily reporter from Grafana.

Expand Down
2 changes: 1 addition & 1 deletion docs/en/snapshotcloneserver_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Figure 1 shows the architecture of Curve snapshot service.

After receiving requests from users, the system will create temporary snapshot by calling the interfaces of curvefs, then it will dump the temporary data to object storage system and persist metadata of the snapshot to database. The functions of snapshot system can be concluded into two parts:

1. Provides snapshot interface for users to create, delete and query snapshot infomation.
1. Provides snapshot interface for users to create, delete and query snapshot information.
2. Managing the snapshot data, and control the snapshot data flow in the system using the interface from curvefs and object storage system.

#### curvefs
Expand Down

0 comments on commit 774808a

Please sign in to comment.