diff --git a/encryption-at-rest.md b/encryption-at-rest.md index 7b0b83aba71f3..e02b9b38b3a18 100644 --- a/encryption-at-rest.md +++ b/encryption-at-rest.md @@ -180,7 +180,7 @@ The encryption algorithm currently supported by TiFlash is consistent with that The same master key can be shared by multiple instances of TiFlash, and can also be shared among TiFlash and TiKV. The recommended way to provide a master key in production is via AWS KMS. Alternatively, if using custom key is desired, supplying the master key via file is also supported. The specific method to generate master key and the format of the master key are the same as TiKV. -TiFlash uses the current data key to encrypt all data placed on the disk, including data files, Schmea files, and temporary data files generated during calculations. Data keys are automatically rotated by TiFlash every week by default, and the period is configurable. On key rotation, TiFlash does not rewrite all existing files to replace the key, but background compaction tasks are expected to rewrite old data into new data files, with the most recent data key, if the cluster gets constant write workload. TiFlash keeps track of the key and encryption method used to encrypt each of the files and use the information to decrypt the content on reads. +TiFlash uses the current data key to encrypt all data placed on the disk, including data files, Schema files, and temporary data files generated during calculations. Data keys are automatically rotated by TiFlash every week by default, and the period is configurable. On key rotation, TiFlash does not rewrite all existing files to replace the key, but background compaction tasks are expected to rewrite old data into new data files, with the most recent data key, if the cluster gets constant write workload. TiFlash keeps track of the key and encryption method used to encrypt each of the files and use the information to decrypt the content on reads. ### Key creation diff --git a/pd-configuration-file.md b/pd-configuration-file.md index 6f2c1c176fba4..7245dcf7e21a4 100644 --- a/pd-configuration-file.md +++ b/pd-configuration-file.md @@ -480,7 +480,7 @@ Configuration items related to the [TiDB Dashboard](/dashboard/dashboard-intro.m Configuration items related to the replication mode of all Regions. See [Enable the DR Auto-Sync mode](/two-data-centers-in-one-city-deployment.md#enable-the-dr-auto-sync-mode) for details. -## Controllor +## Controller This section describes the configuration items that are built into PD for [Resource Control](/tidb-resource-control.md).