From ab59ebeae889d887b3f11b554112c9deab9ec89f Mon Sep 17 00:00:00 2001 From: tiancaiamao Date: Tue, 16 May 2023 16:35:31 +0800 Subject: [PATCH 1/2] configuration: add document for the log.timeout configuration --- releases/release-7.1.0.md | 1 + tidb-configuration-file.md | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/releases/release-7.1.0.md b/releases/release-7.1.0.md index 5145b7995f1c3..d7bbf776169ca 100644 --- a/releases/release-7.1.0.md +++ b/releases/release-7.1.0.md @@ -252,6 +252,7 @@ In v7.1.0, the key new features and improvements are as follows: | -------- | -------- | -------- | -------- | | TiDB | [`force-init-stats`](/tidb-configuration-file.md#force-init-stats-new-in-v710) | Newly added | Controls whether to wait for statistics initialization to finish before providing services during TiDB startup. | | TiDB | [`lite-init-stats`](/tidb-configuration-file.md#lite-init-stats-new-in-v710) | Newly added | Controls whether to use lightweight statistics initialization during TiDB startup. | +| TiDB | [`timeout`](/tidb-configuration-file.md#timeout-new-in-v710) | Newly added | Make tidb-server panic if write log operation hang after `timeout` seconds. | | PD | [`store-limit-version`](/pd-configuration-file.md#store-limit-version-new-in-v710) | Newly added | Controls the mode of store limit. Value options are `"v1"` and `"v2"`. | | TiFlash | `http_port` | Deleted | Deprecates the HTTP service port (default `8123`). | | TiCDC | [`sink.enable-partition-separator`](/ticdc/ticdc-changefeed-config.md#cli-and-configuration-parameters-of-ticdc-changefeeds) | Modified | Changes the default value from `false` to `true` after further tests, meaning that partitions in a table are stored in separate directories by default. It is recommended that you keep the value as `true` to avoid the potential issue of data loss during replication of partitioned tables to storage services. | diff --git a/tidb-configuration-file.md b/tidb-configuration-file.md index 2153279f17ddf..1ecbffa0a62ea 100644 --- a/tidb-configuration-file.md +++ b/tidb-configuration-file.md @@ -287,6 +287,13 @@ Configuration items related to log. - Default value: `10000` - When the number of query rows (including the intermediate results based on statistics) is larger than this value, it is an `expensive` operation and outputs log with the `[EXPENSIVE_QUERY]` prefix. +### `timeout` New in v7.1.0 + +- Make tidb panic if write log operation hang after `timeout` seconds +- Default value: `0` (0 means disabled) +- Unit: Second +- In some user's scenarios, the disk for the tidb server's log file is a hot-plug disk or net-mounted one, the disk media could lost forever, tidb server cannot recover automatically from such disaster, it block forever on the writing log opeartion. The tidb-server process still exist but it never respond to the user's request. This configuration is designed for such scenarios. + ## log.file Configuration items related to log files. From 3f05e3e33d25c7a122961d2e9d0426b2f007d502 Mon Sep 17 00:00:00 2001 From: tiancaiamao Date: Thu, 1 Jun 2023 09:20:06 +0800 Subject: [PATCH 2/2] tidb-cloud: update backup-and-restore.md --- tidb-cloud/backup-and-restore.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tidb-cloud/backup-and-restore.md b/tidb-cloud/backup-and-restore.md index fcac75256adb7..692a0f7925c4c 100644 --- a/tidb-cloud/backup-and-restore.md +++ b/tidb-cloud/backup-and-restore.md @@ -14,7 +14,7 @@ This document describes how to back up and restore your TiDB cluster data on TiD > > Currently, the backup and restore feature has the following restrictions: > -> - TiDB Cloud does not support restoring tables in the `mysql` schema, including user permissions and system variables. You can use [Dumpling and Lightning](https://docs.pingcap.com/tidb/dev/backup-and-restore-using-dumpling-lightning) to manually back up and restore these data. +> - TiDB Cloud does not support restoring tables in the `mysql` schema, including user permissions and system variables. > - If you turn on and off PITR (Point-in-time Recovery) multiple times, you can only choose a time point within the recoverable range after the most recent PITR is enabled. The earlier recoverable range is not accessible. > - You cannot disable automatic backup.