From 5a2ccaf40a1a162c17c0b568b49f60cc8293cf6a Mon Sep 17 00:00:00 2001 From: Mattias Jonsson Date: Thu, 13 Jun 2024 11:57:33 +0200 Subject: [PATCH 1/2] Fix Useless Use Of cat --- hardware-and-software-requirements.md | 2 +- pd-recover.md | 8 ++++---- telemetry.md | 2 +- tiflash/tiflash-overview.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hardware-and-software-requirements.md b/hardware-and-software-requirements.md index 944b719df7b68..ed69f8596ff58 100644 --- a/hardware-and-software-requirements.md +++ b/hardware-and-software-requirements.md @@ -160,7 +160,7 @@ You can deploy and run TiDB on the 64-bit generic hardware server platform in th > - For performance-related test, do not use low-performance storage and network hardware configuration, in order to guarantee the correctness of the test result. > - For the TiKV server, it is recommended to use NVMe SSDs to ensure faster reads and writes. > - If you only want to test and verify the features, follow [Quick Start Guide for TiDB](/quick-start-with-tidb.md) to deploy TiDB on a single machine. -> - Starting from v6.3.0, to deploy TiFlash under the Linux AMD64 architecture, the CPU must support the AVX2 instruction set. Ensure that `cat /proc/cpuinfo | grep avx2` has output. To deploy TiFlash under the Linux ARM64 architecture, the CPU must support the ARMv8 instruction set architecture. Ensure that `cat /proc/cpuinfo | grep 'crc32' | grep 'asimd'` has output. By using the instruction set extensions, TiFlash's vectorization engine can deliver better performance. +> - Starting from v6.3.0, to deploy TiFlash under the Linux AMD64 architecture, the CPU must support the AVX2 instruction set. Ensure that `grep avx2 /proc/cpuinfo` has output. To deploy TiFlash under the Linux ARM64 architecture, the CPU must support the ARMv8 instruction set architecture. Ensure that `grep 'crc32' /proc/cpuinfo | grep 'asimd'` has output. By using the instruction set extensions, TiFlash's vectorization engine can deliver better performance. ### Production environment diff --git a/pd-recover.md b/pd-recover.md index 24b3bd3049d80..bc74a66c1f9ff 100644 --- a/pd-recover.md +++ b/pd-recover.md @@ -76,7 +76,7 @@ To get the cluster ID from the PD log, run the following command: {{< copyable "shell-regular" >}} ```bash -cat {{/path/to}}/pd.log | grep "init cluster id" +grep "init cluster id" {{/path/to}}/pd.log ``` ```bash @@ -91,7 +91,7 @@ To get the cluster ID from the TiDB log, run the following command: {{< copyable "shell-regular" >}} ```bash -cat {{/path/to}}/tidb.log | grep "init cluster id" +grep "init cluster id" {{/path/to}}/tidb.log ``` ```bash @@ -106,7 +106,7 @@ To get the cluster ID from the TiKV log, run the following command: {{< copyable "shell-regular" >}} ```bash -cat {{/path/to}}/tikv.log | grep "connect to PD cluster" +grep "connect to PD cluster" {{/path/to}}/tikv.log ``` ```bash @@ -129,7 +129,7 @@ To get the allocated ID from the PD log, you need to make sure that the log you {{< copyable "shell-regular" >}} ```bash -cat {{/path/to}}/pd*.log | grep "idAllocator allocates a new id" | awk -F'=' '{print $2}' | awk -F']' '{print $1}' | sort -r -n | head -n 1 +grep "idAllocator allocates a new id" {{/path/to}}/pd*.log | awk -F'=' '{print $2}' | awk -F']' '{print $1}' | sort -r -n | head -n 1 ``` ```bash diff --git a/telemetry.md b/telemetry.md index 6c1cb5bf87112..b9c3c9f505a39 100644 --- a/telemetry.md +++ b/telemetry.md @@ -80,7 +80,7 @@ When the telemetry collection feature is enabled for TiSpark, the Spark module w You can view TiSpark usage information that is collected in Spark logs. You can set the Spark log level to INFO or lower, for example: ```shell -cat {spark.log} | grep Telemetry report | tail -n 1 +grep "Telemetry report" {spark.log} | tail -n 1 ``` ## Disable telemetry diff --git a/tiflash/tiflash-overview.md b/tiflash/tiflash-overview.md index 2999f51cae4f4..7ce7ea01a39ce 100644 --- a/tiflash/tiflash-overview.md +++ b/tiflash/tiflash-overview.md @@ -26,7 +26,7 @@ TiFlash provides the columnar storage, with a layer of coprocessors efficiently TiFlash conducts real-time replication of data in the TiKV nodes at a low cost that does not block writes in TiKV. Meanwhile, it provides the same read consistency as in TiKV and ensures that the latest data is read. The Region replica in TiFlash is logically identical to those in TiKV, and is split and merged along with the Leader replica in TiKV at the same time. -To deploy TiFlash under the Linux AMD64 architecture, the CPU must support the AVX2 instruction set. Ensure that `cat /proc/cpuinfo | grep avx2` has output. To deploy TiFlash under the Linux ARM64 architecture, the CPU must support the ARMv8 instruction set architecture. Ensure that `cat /proc/cpuinfo | grep 'crc32' | grep 'asimd'` has output. By using the instruction set extensions, TiFlash's vectorization engine can deliver better performance. +To deploy TiFlash under the Linux AMD64 architecture, the CPU must support the AVX2 instruction set. Ensure that `grep avx2 /proc/cpuinfo` has output. To deploy TiFlash under the Linux ARM64 architecture, the CPU must support the ARMv8 instruction set architecture. Ensure that `grep 'crc32' /proc/cpuinfo | grep 'asimd'` has output. By using the instruction set extensions, TiFlash's vectorization engine can deliver better performance. From 3c7080f641a1ea8ea17057176909253f325e8b9c Mon Sep 17 00:00:00 2001 From: Aolin Date: Thu, 13 Jun 2024 19:06:32 +0800 Subject: [PATCH 2/2] Fix Useless Use Of cat --- releases/release-6.3.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/release-6.3.0.md b/releases/release-6.3.0.md index ad4b13bd9faf8..9d14c91297dad 100644 --- a/releases/release-6.3.0.md +++ b/releases/release-6.3.0.md @@ -261,7 +261,7 @@ In v6.3.0-DMR, the key new features and improvements are as follows: * Log backup supports GCS and Azure Blob Storage as backup storage. * Log backup is now compatible with the `exchange partition` DDL. * The SQL statement `ALTER TABLE ...SET TiFLASH MODE ...` previously used for enabling [fastscan](/tiflash/use-fastscan.md) is deprecated, and replaced by the system variable [`tiflash_fastscan`](/system-variables.md#tiflash_fastscan-new-in-v630). When you upgrade from v6.2.0 to v6.3.0, all FastScan settings in v6.2.0 will become invalid, but will not affect the normal reading of data. In this case, you need to configure the variable [`tiflash_fastscan`](/system-variables.md#tiflash_fastscan-new-in-v630) to enable or disable FastScan. When you upgrade from an earlier version to v6.3.0, the FastScan feature is not enabled by default for all sessions to keep data consistent. -* To deploy TiFlash under the Linux AMD64 architecture, the CPU must support the AVX2 instruction set. Ensure that `cat /proc/cpuinfo | grep avx2` has output. To deploy TiFlash under the Linux ARM64 architecture, the CPU must support the ARMv8 instruction set architecture. Ensure that `cat /proc/cpuinfo | grep 'crc32' | grep 'asimd'` has output. By using the instruction set extensions, TiFlash's vectorization engine can deliver better performance. +* To deploy TiFlash under the Linux AMD64 architecture, the CPU must support the AVX2 instruction set. Ensure that `grep avx2 /proc/cpuinfo` has output. To deploy TiFlash under the Linux ARM64 architecture, the CPU must support the ARMv8 instruction set architecture. Ensure that `grep 'crc32' /proc/cpuinfo | grep 'asimd'` has output. By using the instruction set extensions, TiFlash's vectorization engine can deliver better performance. * The minimum version of HAProxy that works with TiDB is now v1.5. HAProxy versions between v1.5 and v2.1 now require the `post-41` configuration option to be set in `mysql-check`. It is recommended to use HAProxy v2.2 or newer. ## Removed feature