Update upgrade docs (#1427)

* Update upgrade docs * Update upgrade docs * Update upgrade-nebula-from-200-to-latest.md * Update upgrade-nebula-graph-to-latest.md * Update upgrade-nebula-graph-to-latest.md * Update upgrade-nebula-graph-to-latest.md * Update upgrade-nebula-graph-to-latest.md * Update upgrade-nebula-graph-to-latest.md * Update upgrade-nebula-graph-to-latest.md * Resolve Whitewum's and Harris's comments * Fix some issues * update resource calculation * add caution for date_time_zonespec.csv
vesoft-inc · Jan 27, 2022 · c6e13fe · c6e13fe
1 parent ee11fb8
commit c6e13fe
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 261 deletions.
diff --git a/docs-2.0/20.appendix/learning-path.md b/docs-2.0/20.appendix/learning-path.md
@@ -89,8 +89,7 @@
 
   | 文档                                                         |
   | ------------------------------------------------------------ |
-  | [升级 v2.0.x 至当前版本](https://docs.nebula-graph.com.cn/{{nebula.release}}/4.deployment-and-installation/3.upgrade-nebula-graph/upgrade-nebula-from-200-to-latest/) |
-  | [升级 v2.0.0-GA 以下版本至当前版本](https://docs.nebula-graph.com.cn/{{nebula.release}}/4.deployment-and-installation/3.upgrade-nebula-graph/upgrade-nebula-graph-to-latest/) |
+  | [升级 Nebula Graph](https://docs.nebula-graph.com.cn/{{nebula.release}}/4.deployment-and-installation/3.upgrade-nebula-graph/upgrade-nebula-graph-to-latest/) |
 
 ### 3.3 配置Nebula
 

diff --git a/docs-2.0/4.deployment-and-installation/1.resource-preparations.md b/docs-2.0/4.deployment-and-installation/1.resource-preparations.md
@@ -204,7 +204,7 @@ storaged 进程的数量不会影响图空间副本的数量。
 | 资源  |单位 | 计算公式        |说明|
 |:--- |:---|:--- |:---|
 | 硬盘空间  |Bytes| `点和边的总数` * `属性的平均字节大小` * 6 * 120% |由于边存在存储放大现象，所以需要`点和边的总数` * `属性的平均字节大小` * 6 的空间，详情请参见[切边与存储放大](../1.introduction/3.nebula-graph-architecture/4.storage-service.md)。|
-| 内存  |Bytes| [`点和边的总数` * 15 + `RocksDB 实例数量` * (`write_buffer_size` * `max_write_buffer_number` + `块缓存大小`)] * 120% |`点和边的总数` * 15 是 [BloomFilter](https://zh.wikipedia.org/wiki/%E5%B8%83%E9%9A%86%E8%BF%87%E6%BB%A4%E5%99%A8) 需要占用的内存空间，`write_buffer_size`和`max_write_buffer_number`是 RocksDB 内存相关参数，详情请参见 [MemTable](https://github.com/facebook/rocksdb/wiki/MemTable)。块缓存大小请参见 [Memory usage in RocksDB](https://github.com/facebook/rocksdb/wiki/Memory-usage-in-RocksDB#block-cache)。|
+| 内存  |Bytes| [`点和边的总数` * 16 + `RocksDB 实例数量` * (`write_buffer_size` * `max_write_buffer_number` + `块缓存大小`)] * 120% |`点和边的总数` * 16 是 [BloomFilter](https://zh.wikipedia.org/wiki/%E5%B8%83%E9%9A%86%E8%BF%87%E6%BB%A4%E5%99%A8) 需要占用的内存空间，`write_buffer_size`和`max_write_buffer_number`是 RocksDB 内存相关参数，详情请参见 [MemTable](https://github.com/facebook/rocksdb/wiki/MemTable)。块缓存大小请参见 [Memory usage in RocksDB](https://github.com/facebook/rocksdb/wiki/Memory-usage-in-RocksDB#block-cache)。|
 | 分区数量 |-| `集群硬盘数量` * `disk_partition_num_multiplier`     |`disk_partition_num_multiplier`是取值为 2~10 的一个整数，用于衡量硬盘性能。HDD 使用 2。|
 
 - 问题 1：为什么磁盘空间和内存都要乘以 120%？