Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
qiancai committed Aug 5, 2024
2 parents 21e9071 + 1708943 commit b50454f
Show file tree
Hide file tree
Showing 8 changed files with 150 additions and 3 deletions.
1 change: 1 addition & 0 deletions TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,7 @@
- v7.6
- [7.6.0-DMR](/releases/release-7.6.0.md)
- v7.5
- [7.5.3](/releases/release-7.5.3.md)
- [7.5.2](/releases/release-7.5.2.md)
- [7.5.1](/releases/release-7.5.1.md)
- [7.5.0](/releases/release-7.5.0.md)
Expand Down
10 changes: 10 additions & 0 deletions br/use-br-command-line-tool.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,23 @@ A `tiup br` command consists of multiple layers of sub-commands. Currently, br c
* `tiup br backup`: used to back up the data of the TiDB cluster.
* `tiup br log`: used to start and manage log backup tasks.
* `tiup br restore`: used to restore backup data of the TiDB cluster.
* `tiup br debug`: used to parse backup metadata, check backup data, and so on.

`tiup br backup` and `tiup br restore` include the following sub-commands:

* `full`: used to back up or restore all the cluster data.
* `db`: used to back up or restore a specified database of the cluster.
* `table`: used to back up or restore a single table in the specified database of the cluster.

`tiup br debug` incudes the following sub-commands:

* `checksum`: (hidden parameter) used to offline check the integrity of backup data to ensure that all backup files match the CRC64 checksum results calculated by [`ADMIN CHECKSUM TABLE`](/sql-statements/sql-statement-admin-checksum-table.md).
* `backupmeta`: used to check whether an intersection exists among backup data files. In normal cases, backup data files do not intersect.
* `decode`: used to parse the `backupmeta` metadata file of a full backup into JSON format. In addition, you can parse specific fields using the `--field` parameter.
* `encode`: used to encode the `backupmeta.json` metadata file of a full backup into the protobuf format that is used during data restore.
* `reset-pd-config-as-default`: (deprecated) used to restore the PD configurations that were changed during the data recovery process to default configurations.
* `search-log-backup`: used to search for specific key information in log backup data.

### Common options

* `--pd`: specifies the PD service address. For example, `"${PD_IP}:2379"`.
Expand Down
2 changes: 1 addition & 1 deletion information-schema/information-schema-keywords.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ summary: Learn the `KEYWORDS` INFORMATION_SCHEMA table.

# KEYWORDS

Starting from v7.6.0, TiDB provides the `KEYWORDS` table. You can use this table to get information about [keywords](/keywords.md) in TiDB.
Starting from v7.5.3 and v7.6.0, TiDB provides the `KEYWORDS` table. You can use this table to get information about [keywords](/keywords.md) in TiDB.

```sql
USE INFORMATION_SCHEMA;
Expand Down
129 changes: 129 additions & 0 deletions releases/release-7.5.3.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions releases/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ summary: TiDB has released multiple versions, including 8.2.0, 8.1.0, 8.0.0-DMR,

## 7.5

- [7.5.3](/releases/release-7.5.3.md): 2024-08-05
- [7.5.2](/releases/release-7.5.2.md): 2024-06-13
- [7.5.1](/releases/release-7.5.1.md): 2024-02-29
- [7.5.0](/releases/release-7.5.0.md): 2023-12-01
Expand Down
1 change: 1 addition & 0 deletions releases/release-timeline.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ This document shows all the released TiDB versions in reverse chronological orde

| Version | Release Date |
| :--- | :--- |
| [7.5.3](/releases/release-7.5.3.md) | 2024-08-05 |
| [8.2.0-DMR](/releases/release-8.2.0.md) | 2024-07-11 |
| [6.5.10](/releases/release-6.5.10.md) | 2024-06-20 |
| [7.5.2](/releases/release-7.5.2.md) | 2024-06-13 |
Expand Down
3 changes: 2 additions & 1 deletion sql-logical-optimization.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ This chapter introduces the following key rewrites:
- [Predicates Push Down](/predicate-push-down.md)
- [Partition Pruning](/partition-pruning.md)
- [TopN and Limit Operator Push Down](/topn-limit-push-down.md)
- [Join Reorder](/join-reorder.md)
- [Join Reorder](/join-reorder.md)
- [Derive TopN or Limit from Window Functions](/derive-topn-from-window.md)
6 changes: 5 additions & 1 deletion upgrade-tidb-using-tiup.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,11 @@ Now, the offline mirror has been upgraded successfully. If an error occurs durin
To avoid undefined behaviors or other unexpected problems during the upgrade, it is recommended to check the following items before the upgrade.
- Cluster DDLs: It is recommended to execute the [`ADMIN SHOW DDL`](/sql-statements/sql-statement-admin-show-ddl.md) statement to check whether there is an ongoing DDL job. If yes, wait for its execution or cancel it by executing the [`ADMIN CANCEL DDL`](/sql-statements/sql-statement-admin-cancel-ddl.md) statement before performing an upgrade.
- Cluster DDLs:
- If you use [smooth upgrade](/smooth-upgrade-tidb.md), you do not need to check the DDL operations of your TiDB cluster. You do not need to wait for the completion of DDL jobs or cancel ongoing DDL jobs.
- If you do not use [smooth upgrade](/smooth-upgrade-tidb.md), it is recommended to use the [`ADMIN SHOW DDL`](/sql-statements/sql-statement-admin-show-ddl.md) statement to check whether ongoing DDL jobs exist. If an ongoing DDL job exists, wait for the completion of its execution or cancel it using the [`ADMIN CANCEL DDL`](/sql-statements/sql-statement-admin-cancel-ddl.md) statement before performing an upgrade.
- Cluster backup: It is recommended to execute the [`SHOW [BACKUPS|RESTORES]`](/sql-statements/sql-statement-show-backups.md) statement to check whether there is an ongoing backup or restore task in the cluster. If yes, wait for its completion before performing an upgrade.
### Step 5: Check the health status of the current cluster
Expand Down

0 comments on commit b50454f

Please sign in to comment.