Skip to content

Commit 47b7bd0

Browse files
committed
minor wording updates
1 parent c1b3a42 commit 47b7bd0

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

pd-configuration-file.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ Configuration items related to scheduling
293293
+ 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.
294294
+ Default value: `540000`. Before v8.4.0, the default value is `200000`. Starting from v8.4.0, the default value is `540000`.
295295
296-
### `max-affinity-merge-region-size` <span class="version-mark">Introduced in versions v8.5.5 and v9.0.0</span>
296+
### `max-affinity-merge-region-size` <span class="version-mark">New in versions v8.5.5 and v9.0.0</span>
297297
298298
+ Controls the threshold for automatically merging small adjacent Regions that belong to the same [affinity](/table-affinity.md) group. When a Region belongs to an affinity group and its size is smaller than this threshold, PD attempts to merge this Region with other small adjacent Regions in the same affinity group to reduce the number of Regions and maintain the affinity effect.
299299
+ Setting it to `0` disables the automatic merging of small adjacent Regions within an affinity group.
@@ -380,7 +380,7 @@ Configuration items related to scheduling
380380
+ The number of the `Region Merge` scheduling tasks performed at the same time. Set this parameter to `0` to disable `Region Merge`.
381381
+ Default value: `8`
382382
383-
### `affinity-schedule-limit` <span class="version-mark">Introduced in versions v8.5.5 and v9.0.0</span>
383+
### `affinity-schedule-limit` <span class="version-mark">New in v8.5.5 and v9.0.0</span>
384384
385385
+ Controls the number of [affinity](/table-affinity.md) scheduling tasks that can be performed concurrently. Setting it to `0` disables affinity scheduling.
386386
+ Default value: `0`

sql-statements/sql-statement-create-table.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ The following *table_options* are supported. Other options such as `AVG_ROW_LENG
173173
| `CHARACTER SET` | To specify the [character set](/character-set-and-collation.md) for the table | `CHARACTER SET` = 'utf8mb4' |
174174
| `COLLATE` | To specify the character set collation for the table | `COLLATE` = 'utf8mb4_bin' |
175175
| `COMMENT` | The comment information | `COMMENT` = 'comment info' |
176-
| `AFFINITY` | Enables affinity scheduling for a table or partition. It can be set to `'table'` for non-partitioned tables and `'partition'` for partitioned tables. Setting it to `'none'` or leaving it empty disables affinity scheduling. | `AFFINITY` = 'table' |
176+
| `AFFINITY` | To enable affinity scheduling for a table or partition. It can be set to `'table'` for non-partitioned tables and `'partition'` for partitioned tables. Setting it to `'none'` or leaving it empty disables affinity scheduling. | `AFFINITY` = 'table' |
177177

178178
<CustomContent platform="tidb">
179179

sql-statements/sql-statement-show-affinity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ The meaning of each column is as follows:
4848
- `Stable`: all Regions have reached the target distribution.
4949
- `Region_count`: the current number of Regions in the affinity group.
5050
- `Affinity_region_count`: the number of Regions that currently meet the affinity replica distribution requirements.
51-
- When `Affinity_region_count` is less than `Region_count`, it indicates that some Regions have not yet completed affinity-replica scheduling.
52-
- When `Affinity_region_count` equals `Region_count`, it indicates that affinity-replica scheduling is complete, meaning the distribution of all related Regions meets the affinity requirements. However, it does not indicate that related Region merge operations are completed.
51+
- When `Affinity_region_count` is less than `Region_count`, it indicates that some Regions have not yet completed replica scheduling based on affinity.
52+
- When `Affinity_region_count` equals `Region_count`, it indicates that replica scheduling based on affinity is complete, meaning the distribution of all related Regions meets the affinity requirements. However, it does not indicate that related Region merge operations are completed.
5353

5454
## MySQL compatibility
5555

table-affinity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ You can view table or partition affinity information in the following ways:
9797

9898
- **Automatic splitting of Regions**: when a Region belongs to an affinity group and affinity is in effect, automatic splitting of that Region is disabled by default to avoid the creation of too many Regions that could weaken the affinity effect. Automatic splitting is triggered only when the Region size exceeds four times the value of [`schedule.max-affinity-merge-region-size`](/pd-configuration-file.md#max-affinity-merge-region-size-new-in-v855-and-v900). Note that splits triggered by components other than TiKV or PD (such as manual splits triggered by [`SPLIT TABLE`](/sql-statements/sql-statement-split-region.md)) are not subject to this restriction.
9999

100-
- **Degradation and expiration mechanism**: If the TiKV nodes hosting the target Leaders or Voters in an affinity group become unavailable (for example, due to node failure or insufficient disk space), if a Leader is evicted, or if there is a conflict with existing placement rules, PD marks the affinity group as degraded. During degradation, affinity scheduling for the corresponding table or partition is paused.
100+
- **Degradation and expiration mechanism**: if the TiKV nodes hosting the target Leaders or Voters in an affinity group become unavailable (for example, due to node failure or insufficient disk space), if a Leader is evicted, or if there is a conflict with existing placement rules, PD marks the affinity group as degraded. During degradation, affinity scheduling for the corresponding table or partition is paused.
101101

102102
- If the affected nodes recover within 10 minutes, PD resumes scheduling based on the original affinity settings.
103103
- If the affected nodes do not recover within 10 minutes, the affinity group is marked as expired. At this point, PD restores normal scheduling behavior (the status in [`SHOW AFFINITY`](/sql-statements/sql-statement-show-affinity.md) returns to `Pending`), and automatically updates Leaders and Voters in the affinity group to re-enable affinity scheduling.

0 commit comments

Comments
 (0)