This is an automated email from the ASF dual-hosted git repository. luzhijing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/doris-website.git
The following commit(s) were added to refs/heads/master by this push: new 24c4925bd6e [docs](trash) update trash default expire time (#817) 24c4925bd6e is described below commit 24c4925bd6eec563e9b2308bb45844de9b778967 Author: zhannngchen <48427519+zhannngc...@users.noreply.github.com> AuthorDate: Tue Jul 16 18:33:02 2024 +0800 [docs](trash) update trash default expire time (#817) update trash default expire time to 1 day see https://github.com/apache/doris/pull/37170 --- docs/admin-manual/config/be-config.md | 4 ++-- docs/admin-manual/data-admin/delete-recover.md | 2 +- .../current/admin-manual/config/be-config.md | 4 ++-- .../current/admin-manual/data-admin/delete-recover.md | 2 +- .../version-2.1/admin-manual/config/be-config.md | 4 ++-- .../version-2.1/admin-manual/data-admin/delete-recover.md | 2 +- versioned_docs/version-2.1/admin-manual/config/be-config.md | 4 ++-- versioned_docs/version-2.1/admin-manual/data-admin/delete-recover.md | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/admin-manual/config/be-config.md b/docs/admin-manual/config/be-config.md index 228464c6d0b..3c0002dac35 100644 --- a/docs/admin-manual/config/be-config.md +++ b/docs/admin-manual/config/be-config.md @@ -205,8 +205,8 @@ There are two ways to configure BE configuration items: #### `trash_file_expire_time_sec` -* Description: The interval for cleaning the recycle bin is 72 hours. When the disk space is insufficient, the file retention period under trash may not comply with this parameter -* Default value: 259200 +* Description: The interval for cleaning the recycle bin is 24 hours. When the disk space is insufficient, the file retention period under trash may not comply with this parameter +* Default value: 86400 #### `es_http_timeout_ms` diff --git a/docs/admin-manual/data-admin/delete-recover.md b/docs/admin-manual/data-admin/delete-recover.md index 802738e511c..d46922b94a1 100644 --- a/docs/admin-manual/data-admin/delete-recover.md +++ b/docs/admin-manual/data-admin/delete-recover.md @@ -80,7 +80,7 @@ For more detailed syntax and best practices used by RECOVER, please refer to the ### Restore data from BE Recycle Bin -During the user's use of Doris, some valid tablets (including metadata and data) may be deleted due to some misoperations or online bugs. In order to prevent data loss in these abnormal situations, Doris provides a recycle bin mechanism to protect user data. Tablet data deleted by users will not be deleted directly, but will be stored in the recycle bin for a period of time. After a period of time, there will be a regular cleaning mechanism to delete expired data. By default, when the di [...] +During the user's use of Doris, some valid tablets (including metadata and data) may be deleted due to some misoperations or online bugs. In order to prevent data loss in these abnormal situations, Doris provides a recycle bin mechanism to protect user data. Tablet data deleted by users will not be deleted directly, but will be stored in the recycle bin for a period of time. After a period of time, there will be a regular cleaning mechanism to delete expired data. By default, when the di [...] The data in the BE recycle bin includes: tablet data file (.dat), tablet index file (.idx) and tablet metadata file (.hdr). The data will be stored in a path in the following format: diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/config/be-config.md b/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/config/be-config.md index 01ccf4e2445..c3be1fb8a7b 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/config/be-config.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/config/be-config.md @@ -214,8 +214,8 @@ BE 重启后该配置将失效。如果想持久化修改结果,使用如下 #### `trash_file_expire_time_sec` -* 描述:回收站清理的间隔,72 个小时,当磁盘空间不足时,trash 下的文件保存期可不遵守这个参数 -* 默认值:259200 +* 描述:回收站清理的间隔,24 个小时,当磁盘空间不足时,trash 下的文件保存期可不遵守这个参数 +* 默认值:86400 #### `es_http_timeout_ms` diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/delete-recover.md b/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/delete-recover.md index c300a60d971..e2c7b0da66e 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/delete-recover.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/delete-recover.md @@ -86,7 +86,7 @@ RECOVER PARTITION p1 FROM example_tbl; 为了防止在这些异常情况出现数据丢失,Doris 提供了回收站机制,来保护用户数据。 -用户删除的 tablet 数据在 BE 端不会被直接删除,会被放在回收站中存储一段时间,在一段时间之后会有定时清理机制将过期的数据删除。默认情况下,在磁盘空间占用不超过 81%(BE 配置`config.storage_flood_stage_usage_percent` * 0.9 * 100%)时,BE 回收站中的数据最长保留 3 天(见 BE 配置`config.trash_file_expire_time_sec`)。 +用户删除的 tablet 数据在 BE 端不会被直接删除,会被放在回收站中存储一段时间,在一段时间之后会有定时清理机制将过期的数据删除。默认情况下,在磁盘空间占用不超过 81%(BE 配置`config.storage_flood_stage_usage_percent` * 0.9 * 100%)时,BE 回收站中的数据最长保留 1 天(见 BE 配置`config.trash_file_expire_time_sec`)。 BE 回收站中的数据包括:tablet 的 data 文件 (.dat),tablet 的索引文件 (.idx) 和 tablet 的元数据文件 (.hdr)。数据将会存放在如下格式的路径: diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/config/be-config.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/config/be-config.md index 90b083f9303..e5405bba80a 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/config/be-config.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/config/be-config.md @@ -214,8 +214,8 @@ BE 重启后该配置将失效。如果想持久化修改结果,使用如下 #### `trash_file_expire_time_sec` -* 描述:回收站清理的间隔,72 个小时,当磁盘空间不足时,trash 下的文件保存期可不遵守这个参数 -* 默认值:259200 +* 描述:回收站清理的间隔,24 个小时,当磁盘空间不足时,trash 下的文件保存期可不遵守这个参数 +* 默认值:86400 #### `es_http_timeout_ms` diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/delete-recover.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/delete-recover.md index c300a60d971..e2c7b0da66e 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/delete-recover.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/delete-recover.md @@ -86,7 +86,7 @@ RECOVER PARTITION p1 FROM example_tbl; 为了防止在这些异常情况出现数据丢失,Doris 提供了回收站机制,来保护用户数据。 -用户删除的 tablet 数据在 BE 端不会被直接删除,会被放在回收站中存储一段时间,在一段时间之后会有定时清理机制将过期的数据删除。默认情况下,在磁盘空间占用不超过 81%(BE 配置`config.storage_flood_stage_usage_percent` * 0.9 * 100%)时,BE 回收站中的数据最长保留 3 天(见 BE 配置`config.trash_file_expire_time_sec`)。 +用户删除的 tablet 数据在 BE 端不会被直接删除,会被放在回收站中存储一段时间,在一段时间之后会有定时清理机制将过期的数据删除。默认情况下,在磁盘空间占用不超过 81%(BE 配置`config.storage_flood_stage_usage_percent` * 0.9 * 100%)时,BE 回收站中的数据最长保留 1 天(见 BE 配置`config.trash_file_expire_time_sec`)。 BE 回收站中的数据包括:tablet 的 data 文件 (.dat),tablet 的索引文件 (.idx) 和 tablet 的元数据文件 (.hdr)。数据将会存放在如下格式的路径: diff --git a/versioned_docs/version-2.1/admin-manual/config/be-config.md b/versioned_docs/version-2.1/admin-manual/config/be-config.md index f681d6f9566..8d9e91093f0 100644 --- a/versioned_docs/version-2.1/admin-manual/config/be-config.md +++ b/versioned_docs/version-2.1/admin-manual/config/be-config.md @@ -205,8 +205,8 @@ There are two ways to configure BE configuration items: #### `trash_file_expire_time_sec` -* Description: The interval for cleaning the recycle bin is 72 hours. When the disk space is insufficient, the file retention period under trash may not comply with this parameter -* Default value: 259200 +* Description: The interval for cleaning the recycle bin is 24 hours. When the disk space is insufficient, the file retention period under trash may not comply with this parameter +* Default value: 86400 #### `es_http_timeout_ms` diff --git a/versioned_docs/version-2.1/admin-manual/data-admin/delete-recover.md b/versioned_docs/version-2.1/admin-manual/data-admin/delete-recover.md index 802738e511c..d46922b94a1 100644 --- a/versioned_docs/version-2.1/admin-manual/data-admin/delete-recover.md +++ b/versioned_docs/version-2.1/admin-manual/data-admin/delete-recover.md @@ -80,7 +80,7 @@ For more detailed syntax and best practices used by RECOVER, please refer to the ### Restore data from BE Recycle Bin -During the user's use of Doris, some valid tablets (including metadata and data) may be deleted due to some misoperations or online bugs. In order to prevent data loss in these abnormal situations, Doris provides a recycle bin mechanism to protect user data. Tablet data deleted by users will not be deleted directly, but will be stored in the recycle bin for a period of time. After a period of time, there will be a regular cleaning mechanism to delete expired data. By default, when the di [...] +During the user's use of Doris, some valid tablets (including metadata and data) may be deleted due to some misoperations or online bugs. In order to prevent data loss in these abnormal situations, Doris provides a recycle bin mechanism to protect user data. Tablet data deleted by users will not be deleted directly, but will be stored in the recycle bin for a period of time. After a period of time, there will be a regular cleaning mechanism to delete expired data. By default, when the di [...] The data in the BE recycle bin includes: tablet data file (.dat), tablet index file (.idx) and tablet metadata file (.hdr). The data will be stored in a path in the following format: --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org