From 8da37e4dd80b8222522f68f0083776b26fddea9f Mon Sep 17 00:00:00 2001 From: slasher Date: Thu, 30 Nov 2023 10:44:08 +0800 Subject: [PATCH] chore(docs): fix some typo Signed-off-by: slasher --- .gitignore | 17 ++++++------- build.sh | 25 ++++++------------- .../source/maintenance/configs/datanode.md | 8 +++--- docs/source/maintenance/configs/datanode.md | 6 ++--- 4 files changed, 21 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 95dfd2662..7f1ccaa71 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,20 @@ -build/bin -build/rocksdb -build/snappy -build/out/ .DS_Store .idea .vscode +blobstore/.deps/ +blobstore/bin/ +build/bin +build/include/ +build/lib/ +build/out/ docker/bin docker/docker_data +docker/log docs/build tmp/ -docker/log console/html -vendor/dep vendor java/target java/src/main/resources/*.so -blobstore/.deps/ -blobstore/bin/ -/build/include/ -/build/lib/ /cover.output /cubefs_unittest.output diff --git a/build.sh b/build.sh index 11736f5c9..58fe7ef27 100755 --- a/build.sh +++ b/build.sh @@ -2,49 +2,41 @@ RootPath=$(cd $(dirname $0); pwd) - build_linux_x86_64() { make - } -# build arm64 with amd64 docker ubuntu:focal, apt-get install -y gcc-9-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-9-aarch64-linux-gnu g++-aarch64-linux-gnu +# build arm64 with amd64 docker ubuntu:focal, apt-get install -y gcc-9-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-9-aarch64-linux-gnu g++-aarch64-linux-gnu # Support Ubuntu focal, not support CentOS7 build_linux_arm64_gcc9() { echo "build linux arm64 gcc9" get_rocksdb_compress_dep export PORTABLE=1 export ARCH=arm64 - # export CC=aarch64-linux-gnu-gcc + # export CC=aarch64-linux-gnu-gcc export EXTRA_CFLAGS="-Wno-error=deprecated-copy -fno-strict-aliasing -Wclass-memaccess -Wno-error=class-memaccess -Wpessimizing-move -Wno-error=pessimizing-move" export EXTRA_CXXFLAGS=$EXTRA_CFLAGS CGO_ENABLED=1 GOOS=linux GOARCH=arm64 make - - } -# build arm64 with amd64 docker buntu:xenial , apt-get install -y gcc-4.9-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-4.9-aarch64-linux-gnu g++-aarch64-linux-gnu -# support CentOS7 +# build arm64 with amd64 docker buntu:xenial , apt-get install -y gcc-4.9-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-4.9-aarch64-linux-gnu g++-aarch64-linux-gnu +# support CentOS7 # build_linux_arm64_gcc4() { echo "build linux arm64 gcc4.9" get_rocksdb_compress_dep export PORTABLE=1 export ARCH=arm64 - # export CC=aarch64-linux-gnu-gcc + # export CC=aarch64-linux-gnu-gcc export EXTRA_CFLAGS=" -fno-strict-aliasing " export EXTRA_CXXFLAGS=$EXTRA_CFLAGS CGO_ENABLED=1 GOOS=linux GOARCH=arm64 make - - } -# wget compress dep +# wget compress dep get_rocksdb_compress_dep() { - - ################################################################# ## Might check the dep files each in individual if wget failed ## ################################################################# @@ -73,11 +65,8 @@ get_rocksdb_compress_dep() { tar zxf v1.9.3 fi - #rm -rf zlib-1.2.11.tar.gz bzip2-1.0.6.tar.gz v1.4.8 v1.9.3 - cd ${RootPath} - - + cd ${RootPath} } diff --git a/docs-zh/source/maintenance/configs/datanode.md b/docs-zh/source/maintenance/configs/datanode.md index 2f38802fb..ec22a4ee3 100644 --- a/docs-zh/source/maintenance/configs/datanode.md +++ b/docs-zh/source/maintenance/configs/datanode.md @@ -1,8 +1,8 @@ # DataNode 配置 ## 配置说明 -| 关键字 | 参数类型 | 描述 | 必需 | -|:---------------|:--------------|:---------------------------------------|:-------| +| 关键字 | 参数类型 | 描述 | 必需 | +|:--------------|:-------------|:---------------------------------------|:-------| | role | string | Role必须配置为“datanode” | 是 | | listen | string | 数据节点作为服务端启动TCP监听的端口 | 是 | | localIP | string | 数据节点作为服务端选用的IP | 否 | @@ -19,8 +19,8 @@ | zoneName | string | 指定区域，默认分配至`default`区域 | 否 | | diskReadIocc | int | 限制单盘并发读操作,小于等于0表示不限制 | 否 | | diskReadFlow | int | 限制单盘读流量,小于等于0表示不限制 | 否 | -| diskReadIocc | int | 限制单盘并发写操作,小于等于0表示不限制 | 否 | -| diskReadFlow | int | 限制单盘写流量,小于等于0表示不限制 | 否 | +| diskWriteIocc | int | 限制单盘并发写操作,小于等于0表示不限制 | 否 | +| diskWriteFlow | int | 限制单盘写流量,小于等于0表示不限制 | 否 | | disks | string slice | 格式：`磁盘挂载路径:预留空间` ，预留空间配置范围`[20G,50G]` | 是 | ## 配置示例 diff --git a/docs/source/maintenance/configs/datanode.md b/docs/source/maintenance/configs/datanode.md index 68303f20f..439ff8fc4 100644 --- a/docs/source/maintenance/configs/datanode.md +++ b/docs/source/maintenance/configs/datanode.md @@ -2,7 +2,7 @@ ## Configuration Description | Keyword | Parameter Type | Description | Required | -|:---------------|:----------------|:---------------------------------------------------------------------------------------------------------------------------------|:----------| +|:--------------|:---------------|:--------------------------------------------------------------------------------------------------------------------------------|:---------| | role | string | Role must be configured as "datanode" | Yes | | listen | string | Port on which the data node starts TCP listening as a server | Yes | | localIP | string | IP address selected by the data node as a server | No | @@ -19,8 +19,8 @@ | zoneName | string | Specify the zone. By default, it is assigned to the `default` zone | No | | diskReadIocc | int | Limit read concurrency io frequency per disk. No limit if less than or equal to 0 | No | | diskReadFlow | int | Limit read io flow per disk. No limit if less than or equal to 0 | No | -| diskReadIocc | int | Limit write concurrency io frequency per disk. No limit if less than or equal to 0 | No | -| diskReadFlow | int | Limit write io flow per disk. No limit if less than or equal to 0 | No | +| diskWriteIocc | int | Limit write concurrency io frequency per disk. No limit if less than or equal to 0 | No | +| diskWriteFlow | int | Limit write io flow per disk. No limit if less than or equal to 0 | No | | disks | string slice | Format: `disk mount path:reserved space`, reserved space configuration range `[20G,50G]` | Yes | ## Configuration Example