Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: xixirangrang <[email protected]>
  • Loading branch information
LykxSassinator and hfxsd authored Sep 18, 2024
1 parent 900aff2 commit ec940ea
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion best-practices/massive-regions-best-practices.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ The default size of a Region is 256 MiB, and you can reduce the number of Region

> **Note:**
>
> The default size of Region is enlarged to 256 MiB since TiDB v8.4.0.
> Starting from v8.4.0, the default size of Region is changed to 256 MiB.
> **Warning:**
>
Expand Down
4 changes: 2 additions & 2 deletions best-practices/pd-scheduling-best-practices.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ Region merge refers to the process of merging adjacent small regions. It serves

Specifically, when a newly split Region exists for more than the value of [`split-merge-interval`](/pd-configuration-file.md#split-merge-interval) (`1h` by default), if the following conditions occur at the same time, this Region triggers the Region merge scheduling:

- The size of this Region is smaller than the value of the [`max-merge-region-size`](/pd-configuration-file.md#max-merge-region-size) (Change to 54 MiB by default since v8.4.0, automatically applied only for newly created clusters).
- The size of this Region is smaller than the value of the [`max-merge-region-size`](/pd-configuration-file.md#max-merge-region-size). Starting from v8.4.0, the default value is changed to 54 MiB. The new default value is automatically applied only for newly created clusters. Existing clusters are not affected.

- The number of keys in this Region is smaller than the value of [`max-merge-region-keys`](/pd-configuration-file.md#max-merge-region-keys) (Change to 540,000 by default since v8.4.0, automatically applied only for newly created clusters).
- The number of keys in this Region is smaller than the value of [`max-merge-region-keys`](/pd-configuration-file.md#max-merge-region-keys). Starting from v8.4.0, the default value is changed to 540,000. The new default value is automatically applied only for newly created clusters. Existing clusters are not affected.

## Query scheduling status

Expand Down
4 changes: 2 additions & 2 deletions pd-configuration-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,13 @@ Configuration items related to scheduling
### `max-merge-region-size`
+ Controls the size limit of `Region Merge`. When the Region size is greater than the specified value, PD does not merge the Region with the adjacent Regions.
+ Default value: `54` (Before v8.4.0, the default value is `20`. Starting from v8.4.0, the default value is `54`.)
+ Default value: `54`. Before v8.4.0, the default value is `20`. Starting from v8.4.0, the default value is `54`.
+ Unit: MiB
### `max-merge-region-keys`
+ Specifies the upper limit of the `Region Merge` key. When the Region key is greater than the specified value, the PD does not merge the Region with its adjacent Regions.
+ Default value: `540000` (Before v8.4.0, the default value is `200000`. Starting from v8.4.0, the default value is `540000`.)
+ Default value: `540000`. Before v8.4.0, the default value is `200000`. Starting from v8.4.0, the default value is `540000`.
### `patrol-region-interval`
Expand Down
6 changes: 3 additions & 3 deletions tikv-configuration-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,7 @@ Configuration items related to Coprocessor.
### `region-split-size`

+ The size of the newly split Region. This value is an estimate.
+ Default value: `"256MiB"`
+ Default value: `"256MiB"`. Before v8.4.0, the default value is `‘96MiB’`.
+ Unit: KiB|MiB|GiB

### `region-max-keys`
Expand All @@ -1093,7 +1093,7 @@ Configuration items related to Coprocessor.
### `region-split-keys`

+ The number of keys in the newly split Region. This value is an estimate.
+ Default value: `2560000`
+ Default value: `2560000`. Before v8.4.0, the default value is `960000’`.

### `consistency-check-method`

Expand Down Expand Up @@ -2147,7 +2147,7 @@ Configuration items related to BR backup.

+ The threshold of the backup SST file size. If the size of a backup file in a TiKV Region exceeds this threshold, the file is backed up to several files with the TiKV Region split into multiple Region ranges. Each of the files in the split Regions is the same size as `sst-max-size` (or slightly larger).
+ For example, when the size of a backup file in the Region of `[a,e)` is larger than `sst-max-size`, the file is backed up to several files with regions `[a,b)`, `[b,c)`, `[c,d)` and `[d,e)`, and the size of `[a,b)`, `[b,c)`, `[c,d)` is the same as that of `sst-max-size` (or slightly larger).
+ Default value: `"384MiB"`. The default value is `"144MiB"` in versions earlier than v8.4.0.
+ Default value: `"384MiB"`. Before v8.4.0, the default value is `"144MiB"`.

### `enable-auto-tune` <span class="version-mark">New in v5.4.0</span>

Expand Down

0 comments on commit ec940ea

Please sign in to comment.