This is an automated cherry-pick of pingcap#10291

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

tikv-configuration-file.md

@@ -319,9 +319,17 @@ Configuration items related to storage
 
 ### `reserve-space`
 
+<<<<<<< HEAD
 + The size of the temporary file that preoccupies the extra space when TiKV is started. The name of temporary file is `space_placeholder_file`, located in the `storage.data-dir` directory. When TiKV runs out of disk space and cannot be started normally, you can delete this file as an emergency intervention and set `reserve-space` to `"0MB"`.
 + Default value: `"2GB"`
 + Unite: MB|GB
+=======
++ When TiKV is started, some space is reserved on the disk as disk protection. When the remaining disk space is less than the reserved space, TiKV restricts some write operations. The reserved space is divided into two parts: 80% of the reserved space is used as the extra disk space required for operations when the disk space is insufficient, and the other 20% is used to store the temporary file. In the process of reclaiming space, if the storage is exhausted by using too much extra disk space, this temporary file serves as the last protection for restoring services.
++ The name of the temporary file is `space_placeholder_file`, located in the `storage.data-dir` directory. When TiKV goes offline because its disk space ran out, if you restart TiKV, the temporary file is automatically deleted and TiKV tries to reclaim the space.
++ When the remaining space is insufficient, TiKV does not create the temporary file. The effectiveness of the protection is related to the size of the reserved space. The size of the reserved space is the larger value between 5% of the disk capacity and this configuration value. When the value of this configuration item is `"0MB"`, TiKV disables this disk protection feature.
++ Default value: `"5GB"`
++ Unit: MB|GB
+>>>>>>> 2e5ee2e14 (Fix typo `Unite:` should be `Unit:` for `reserve-space` (#10291))
 
 ## storage.block-cache