Merge branch 'master' into patch-1

Author: wugongbo

docs/user_manual/quick_starts/en-US/chapter_01_overview_of_the_oceanbase_database/00_introduction.md

@@ -21,7 +21,6 @@ You can contact us in the following ways:
 
 * GitHub page for reporting issues of OceanBase Database Community Edition: [https://github.com/oceanbase/oceanbase/issues](https://github.com/oceanbase/oceanbase/issues) 
 
-* DingTalk group ID: 33254054
 
 > **Note**
 >

docs/user_manual/quick_starts/en-US/chapter_01_overview_of_the_oceanbase_database/01_overview.md

@@ -12,7 +12,7 @@ OceanBase Database has been systematically tested and verified. We recommend tha
 
 | Item    | Requirement   | Description  |
 |---------|-------|-------|
-| Server  | Mainstream servers that adapt to common software from Chinese manufacturers are supported. | The support details are as follows: <ul><li>Physical servers: Suma H620 series, Huawei TaiShan 200 series, and Great Wall Qingtian DF720 </li><li>CPUs: Hygon 7185/7280, Kunpeng 920, and FeiTeng 2000+ </li><li>Operating systems: Kylin V4, Kylin V10, and UOS V20; upper-layer middleware: TongWeb V7.0 and Apusic Application Server V9.0 </li></ul> |
+| Server  | Mainstream servers are supported. | The support details are as follows: <ul><li>Physical servers: Suma H620 series, Huawei TaiShan 200 series, and Great Wall Qingtian DF720 </li><li>CPUs: Hygon 7185/7280, Kunpeng 920, and FeiTeng 2000+ </li><li>Operating systems: Kylin V4, Kylin V10, and UOS V20; upper-layer middleware: TongWeb V7.0 and Apusic Application Server V9.0 </li></ul> |
 | Operating system   | x86 and Arm architectures are supported.  | The following operating systems are supported: <ul><li>Alibaba Cloud Linux 2/3 (kernel: Linux 3.10.0 and later)</li><li>Anolis OS 8.X (kernel: Linux 3.10.0 and later)</li><li>Red Hat Enterprise Linux Server 7.X and 8.X (kernel: Linux 3.10.0 and later)</li><li>CentOS Linux 7.X and 8.X (kernel: Linux 3.10.0 and later)</li><li>Debian 9.X and later (kernel: Linux 3.10.0 and later)</li><li>Ubuntu 20.X and later (kernel: Linux 3.10.0 and later)</li><li>SUSE/openSUSE 15.X and later (kernel: Linux 3.10.0 and later)</li><li>Kylin V10</li><li>UOS V20 </li><li>NFSChina 4.0 and later</li><li>Inspur KOS 5.8</li></ul> |
 | CPU | <ul><li>For a test environment, at least 2 cores are required. </li><li>For a production environment, at least 4 cores are required and 32 cores or more are recommended. </li><li>For a performance test environment, 24 cores or more are recommended. </li></ul> | The values provided here are the minimum number of cores allocated to OceanBase Database, not the total number of cores on servers.  |
 | Memory | <ul><li>For a test environment, at least 6 GB is required. </li><li>For a production environment, at least 16 GB is required. For long-term use, at least 32 GB is required, and a value in the range from 256 GB to 1024 GB is recommended. </li><li>For a performance test environment, a value in the range from 128 GB to 1024 GB is recommended. </li></ul> | The values provided here are the minimum size of memory allocated to OceanBase Database, not the total size of memory on servers. <blockquote><b>Note</b><br></br>If multiple clusters are deployed, we recommend that you use OceanBase Cloud Platform (OCP) for unified O&M management. If a small number of clusters are deployed, we recommend that you use OceanBase Deployer (OBD) for installation and deployment. </blockquote> |

docs/user_manual/quick_starts/en-US/chapter_02_deploy_oceanbase_database/01_preparation_before_deployment.md

@@ -440,7 +440,7 @@ If you have multiple servers available, you can run the `obd web` command to sta
 
    ![Precheck](/img/user_manual/quick_starts/en-US/chapter_02_deploy_oceanbase_database/03_deploy_personal_environment/007.png)
 
-   If an error code is returned, you can click **Automatic Repair** to automatically repair the error, or click **Learn more** to go to the error code document and correct the error based on the reference document. After all the errors are corrected, click **Re-check** to perform a precheck again.
+   If an error code is returned, you can click **Automatic Repair** to automatically repair the error, or click **Learn more** to go to the error code document and correct the error based on the reference document. After all the errors are corrected, click **Re-check** to perform a precheck again. If you need to modify the content in the installation configuration file, you can usually find and edit the configuration file under ~/.obd/cluster/myoceanbase.
 
 8. After the precheck is passed, click **Deploy** to start the deployment.
 
@@ -460,7 +460,7 @@ If you have multiple servers available, you can run the `obd web` command to sta
     # View the cluster list.
     obd cluster list
 
-    # View the details of the myoceanbase cluster.
+    # View the details of the myoceanbase cluster.(Prior to operation, terminate the OBD web process; otherwise, an error will occur: "Another app is currently holding the obd lock.")
     obd cluster display myoceanbase
     ```
 

docs/user_manual/quick_starts/en-US/chapter_02_deploy_oceanbase_database/03_deploy_personal_environment.md

@@ -56,6 +56,7 @@ For more information about the `obd cluster tenant create` command, see the **ob
 * `test2` is a sample tenant name.
 
 * The resource unit and resource pool used by a tenant created by using the OBD command are respectively named `${tenant_name}_unit` and `${tenant_name}_pool`.
+* Note: When creating a tenant using OBD, the maximum occupancy mode is used by default. If resources are tight or you want to create a tenant in the minimum availability mode, it is recommended to use OCP or SQL first.
 
 The output is as follows:
 

docs/user_manual/quick_starts/en-US/chapter_02_deploy_oceanbase_database/06_create-tenant.md

@@ -5,13 +5,15 @@ weight: 4
 
 # 3.3 Run the Sysbench benchmark
 
-Sysbench is a LuaJIT-based multi-thread benchmark tool that allows you to write scripts to test the CPU, memory, thread, I/O, and database performance. It is often used to evaluate and test the database workload under various system parameter configurations. You can run the Sysbench benchmark to test a variety of database businesses by customizing Lua scripts without modifying the source code. 
-
 This topic describes two methods to run the Sysbench benchmark on OceanBase Database in a CentOS Linux 7.9 environment based on the x86 architecture.
 
 * Use OceanBase Deployer (OBD) to run the benchmark. 
 
-* Use the official Sysbench tool to manually run the Sysbench benchmark step by step. 
+* Use the official Sysbench tool to manually run the Sysbench benchmark step by step.
+
+## Sysbench Overview
+
+Sysbench is a LuaJIT-based multi-thread benchmark tool that allows you to write scripts to test the CPU, memory, thread, I/O, and database performance. It is often used to evaluate and test the database workload under various system parameter configurations. You can run the Sysbench benchmark to test a variety of database businesses by customizing Lua scripts without modifying the source code. 
 
 ## Use obdiag to inspect the cluster before running the benchmark
 
@@ -37,15 +39,15 @@ OceanBase Database is a native distributed database system. Root cause analysis
 
 * OceanBase Client (OBClient): For information about OBClient, see the [GitHub repository](https://github.com/oceanbase/obclient).
 
-> **Notice**
+> **Note**
 >
 > In OBClient V2.2.0 or later, the OceanBase 2.0 protocol and end-to-end tracing are enabled by default, which will affect the performance in the Sysbench benchmark. We recommend that you set the `export ENABLE_PROTOCOL_OB20` environment variable to `0` to disable the protocol. 
 
 ## Test plan
 
 The Sysbench benchmark requires five servers, one for deploying Sysbench and OBD, one for deploying OceanBase Database Proxy (ODP) separately, and three for deploying an OceanBase cluster that has three zones, with each containing one OBServer node. 
 
-> **Notice**
+> **Note**
 >
 > * We recommend that you deploy ODP on a separate server to avoid resource contention with OceanBase Database. 
 >