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 e26edb0f4a rename delete-recover to recover-from-recyclebin (#910)
e26edb0f4a is described below
commit e26edb0f4acc2682f74ef55b16b798c1e0e31d20
Author: Yongqiang YANG <98214048+dataroar...@users.noreply.github.com>
AuthorDate: Wed Jul 24 17:21:37 2024 +0800
rename delete-recover to recover-from-recyclebin (#910)
---
.../{delete-recover.md => recyclebin.md} | 20 +++++++++-----------
.../admin-manual/data-admin/recyclebin.md} | 18 ++++++++----------
.../{delete-recover.md => recyclebin.md} | 16 +++++++---------
.../admin-manual/data-admin/recyclebin.md} | 18 ++++++++----------
.../admin-manual/data-admin/recyclebin.md} | 18 ++++++++----------
sidebars.json | 2 +-
.../{delete-recover.md => recyclebin.md} | 18 ++++++++----------
.../{delete-recover.md => recyclebin.md} | 22 ++++++++++------------
.../{delete-recover.md => recyclebin.md} | 22 ++++++++++------------
versioned_sidebars/version-2.0-sidebars.json | 6 +++---
versioned_sidebars/version-2.1-sidebars.json | 6 +++---
versioned_sidebars/version-3.0-sidebars.json | 2 +-
12 files changed, 76 insertions(+), 92 deletions(-)
diff --git a/docs/admin-manual/data-admin/delete-recover.md
b/docs/admin-manual/data-admin/recyclebin.md
similarity index 83%
rename from docs/admin-manual/data-admin/delete-recover.md
rename to docs/admin-manual/data-admin/recyclebin.md
index d46922b94a..75a1373696 100644
--- a/docs/admin-manual/data-admin/delete-recover.md
+++ b/docs/admin-manual/data-admin/recyclebin.md
@@ -1,6 +1,6 @@
---
{
- "title": "Data Recover",
+ "title": "Recover from Recycle Bin",
"language": "en"
}
---
@@ -24,19 +24,17 @@ specific language governing permissions and limitations
under the License.
-->
-# Data Deletion Recovery
+## Data Lifecycle
-Data deletion recovery includes two situations：
+1. When a user executes the `drop database/table/partition` command, Doris
moves the deleted database, table, or partition to the recycle bin. The recover
command can be used to restore all data of the deleted database, table, or
partition from the recycle bin, making them visible again.
-1. After executing the command `drop database/table/partition`, user can use
command `recover` to recover all the data in the entire
database/table/partition. It will restore the metadata of the
database/table/partition from the FE's catalog recycle bin, change them from
invisible to visible again, and the data will also be visible again;
+2. When a tablet is deleted on the BE side, its data is moved to the BE
recycle bin by default. In case of accidental operations or online bugs that
result in some tablets being deleted on the BE, these tablets can be recovered
from the BE recycle bin using maintenance tools.
-2. Due to some misoperations or online bugs, some tablets on BEs are deleted,
and these tablets can be rescued from the BE's trash through maintenance tools.
-
-The above two, the former is aimed at the fact that the
database/table/partition is no longer visible on FE, and the metadata of the
database/table/partition is still kept in the catalog recycle bin of FE. The
latter is aimed at databases/tables/partitions that are visible on FE, but some
BE tablet data is deleted.
+In the above scenarios, the first one pertains to the situation where the
database, table, or partition is no longer visible on the FE, but its metadata
is still retained in the FE recycle bin. The second scenario pertains to the
situation where the database, table, or partition is still visible on the FE,
but some BE tablet data has been deleted.
The two recovery methods are described below.
-## Drop Recovery
+## Recover from FE Recycle Bin
In order to avoid disasters caused by misoperation, Doris supports data
recovery of accidentally deleted databases/tables/partitions. After dropping
table or database, Doris will not physically delete the data immediately, but
will keep it in Trash for a period of time ( The default is 1 day, which can be
configured through the `catalog_trash_expire_second` parameter in fe.conf). The
administrator can use the RECOVER command to restore accidentally deleted data.
@@ -50,7 +48,7 @@ Query FE catalog recycle bin
SHOW CATALOG RECYCLE BIN [ WHERE NAME [ = "name" | LIKE "name_matcher"] ]
```
-For more detailed syntax and best practices, please refer to the
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-reference/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
command manual, You can also type `help SHOW CATALOG RECYCLE BIN` on the MySql
client command line for more help.
+For more detailed syntax and best practices, please refer to the
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-statements/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
command manual, You can also type `help SHOW CATALOG RECYCLE BIN` on the MySql
client command line for more help.
### Start Data Recovery
@@ -73,9 +71,9 @@ RECOVER TABLE example_db.example_tbl;
RECOVER PARTITION p1 FROM example_tbl;
```
-For more detailed syntax and best practices used by RECOVER, please refer to
the
[RECOVER](../../sql-manual/sql-reference/Database-Administration-Statements/RECOVER.md)
command manual, You can also type `HELP RECOVER` on the MySql client command
line for more help.
+For more detailed syntax and best practices used by RECOVER, please refer to
the
[RECOVER](../../sql-manual/sql-statements/Database-Administration-Statements/RECOVER.md)
command manual, You can also type `HELP RECOVER` on the MySql client command
line for more help.
-## Tablet Restore Tool
+## Recover from BE Recycle Bin
### Restore data from BE Recycle Bin
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/admin-manual/data-admin/delete-recover.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/recyclebin.md
similarity index 88%
rename from
i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/admin-manual/data-admin/delete-recover.md
rename to
i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/recyclebin.md
index e2c7b0da66..53a7f5b183 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/admin-manual/data-admin/delete-recover.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/recyclebin.md
@@ -1,6 +1,6 @@
---
{
- "title": "数据删除恢复",
+ "title": "从回收站恢复",
"language": "zh-CN"
}
---
@@ -24,18 +24,16 @@ specific language governing permissions and limitations
under the License.
-->
-# 数据删除恢复
+## 数据生命周期
-数据删除恢复包含两种情况：
+1. 用户执行命令`drop database/table/partition`之后，Doris
会把删除的数据库/表/分区放到回收站，可以使用命令`recover`来恢复整个数据库/表/分区的所有数据从回收站里恢复，把它们从不可见状态，重新变回可见。
+2. BE 侧删除一个 tablet 时，默认会把 tablet 的数据放进 BE 回收站。因为某些误操作或者线上 bug，导致 BE 上部分 tablet
被删除，通过运维工具把这些 tablet 从 BE 回收站中抢救回来。
-1. 用户执行命令`drop
database/table/partition`之后，再使用命令`recover`来恢复整个数据库/表/分区的所有数据。这种修复将会把 FE
上的数据库/表/分区的结构，从 catalog 回收站里恢复过来，把它们从不可见状态，重新变回可见，并且原来的数据也恢复可见；
-2. 用户因为某些误操作或者线上 bug，导致 BE 上部分 tablet 被删除，通过运维工具把这些 tablet 从 BE 回收站中抢救回来。
-
-上面两个，前者针对的是数据库/表/分区在 FE 上已经不可见，且数据库/表/分区的元数据尚保留在 FE 的 catalog
回收站里。而后者针对的是数据库/表/分区在 FE 上可见，但部分 BE tablet 数据被删除。
+上面两个，前者针对的是数据库/表/分区在 FE 上已经不可见，且数据库/表/分区的元数据尚保留在 FE 的回收站里。而后者针对的是数据库/表/分区在 FE
上可见，但部分 BE tablet 数据被删除。
下面分别阐述这两种恢复。
-## Drop 恢复
+## 从 FE 回收站恢复
Doris 为了避免误操作造成的灾难，支持对误删除的数据库/表/分区进行数据恢复，在 drop table 或者 drop database 或者 drop
partition 之后，Doris 不会立刻对数据进行物理删除，而是在 FE 的 catalog 回收站中保留一段时间（默认 1 天，可通过 fe.conf
中`catalog_trash_expire_second`参数配置），管理员可以通过 RECOVER 命令对误删除的数据进行恢复。
@@ -52,7 +50,7 @@ SHOW CATALOG RECYCLE BIN [ WHERE NAME [ = "name" | LIKE
"name_matcher"] ]
这里 name 可以是数据库/表/分区名。
-关于该命令使用的更多详细语法及最佳实践，请参阅
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-reference/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
命令手册，你也可以在 MySql 客户端命令行下输入 `help SHOW CATALOG RECYCLE BIN ` 获取更多帮助信息。
+关于该命令使用的更多详细语法及最佳实践，请参阅
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-statements/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
命令手册，你也可以在 MySql 客户端命令行下输入 `help SHOW CATALOG RECYCLE BIN ` 获取更多帮助信息。
### 开始数据恢复
@@ -78,7 +76,7 @@ RECOVER PARTITION p1 FROM example_tbl;
关于 RECOVER 使用的更多详细语法及最佳实践，请参阅
[RECOVER](../../sql-manual/sql-statements/Database-Administration-Statements/RECOVER.md)
命令手册，你也可以在 MySql 客户端命令行下输入 `help RECOVER` 获取更多帮助信息。
-## BE tablet 数据恢复
+## 从 BE 回收站恢复 Tablet
### 从 BE 回收站中恢复数据
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/admin-manual/data-admin/delete-recover.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/admin-manual/data-admin/recyclebin.md
similarity index 91%
rename from
i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/admin-manual/data-admin/delete-recover.md
rename to
i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/admin-manual/data-admin/recyclebin.md
index 5cd287e1b6..108a65b297 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/admin-manual/data-admin/delete-recover.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/admin-manual/data-admin/recyclebin.md
@@ -1,6 +1,6 @@
---
{
- "title": "数据删除的恢复",
+ "title": "从回收站恢复",
"language": "zh-CN"
}
---
@@ -25,18 +25,16 @@ under the License.
-->
+## 数据生命周期
-数据删除恢复包含两种情况：
+1. 用户执行命令`drop database/table/partition`之后，Doris
会把删除的数据库/表/分区放到回收站，可以使用命令`recover`来恢复整个数据库/表/分区的所有数据从回收站里恢复，把它们从不可见状态，重新变回可见。
+2. BE 侧删除一个 tablet 时，默认会把 tablet 的数据放进 BE 回收站。因为某些误操作或者线上 bug，导致 BE 上部分 tablet
被删除，通过运维工具把这些 tablet 从 BE 回收站中抢救回来。
-1. 用户执行命令`drop
database/table/partition`之后，再使用命令`recover`来恢复整个数据库/表/分区的所有数据。这种修复将会把 FE
上的数据库/表/分区的结构，从 catalog 回收站里恢复过来，把它们从不可见状态，重新变回可见，并且原来的数据也恢复可见；
-
-2. 用户因为某些误操作或者线上 bug，导致 BE 上部分 tablet 被删除，通过运维工具把这些 tablet 从 BE 回收站中抢救回来。
-
-上面两个，前者针对的是数据库/表/分区在 FE 上已经不可见，且数据库/表/分区的元数据尚保留在 FE 的 catalog
回收站里。而后者针对的是数据库/表/分区在 FE 上可见，但部分 BE tablet 数据被删除。
+上面两个，前者针对的是数据库/表/分区在 FE 上已经不可见，且数据库/表/分区的元数据尚保留在 FE 的回收站里。而后者针对的是数据库/表/分区在 FE
上可见，但部分 BE tablet 数据被删除。
下面分别阐述这两种恢复。
-## Drop 恢复
+## 从 FE 回收站恢复
Doris 为了避免误操作造成的灾难，支持对误删除的数据库/表/分区进行数据恢复，在 drop table 或者 drop database 或者 drop
partition 之后，Doris 不会立刻对数据进行物理删除，而是在 FE 的 catalog 回收站中保留一段时间（默认 1 天，可通过 fe.conf
中`catalog_trash_expire_second`参数配置），管理员可以通过 RECOVER 命令对误删除的数据进行恢复。
@@ -79,7 +77,7 @@ RECOVER PARTITION p1 FROM example_tbl;
关于 RECOVER 使用的更多详细语法及最佳实践，请参阅
[RECOVER](../../sql-manual/sql-reference/Database-Administration-Statements/RECOVER.md)
命令手册，你也可以在 MySql 客户端命令行下输入 `help RECOVER` 获取更多帮助信息。
-## BE tablet 数据恢复
+## 从 BE 回收站中恢复 Tablet
### 从 BE 回收站中恢复数据
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/version-2.1/admin-manual/data-admin/recyclebin.md
similarity index 88%
rename from
i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/delete-recover.md
rename to
i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/recyclebin.md
index e2c7b0da66..53a7f5b183 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/version-2.1/admin-manual/data-admin/recyclebin.md
@@ -1,6 +1,6 @@
---
{
- "title": "数据删除恢复",
+ "title": "从回收站恢复",
"language": "zh-CN"
}
---
@@ -24,18 +24,16 @@ specific language governing permissions and limitations
under the License.
-->
-# 数据删除恢复
+## 数据生命周期
-数据删除恢复包含两种情况：
+1. 用户执行命令`drop database/table/partition`之后，Doris
会把删除的数据库/表/分区放到回收站，可以使用命令`recover`来恢复整个数据库/表/分区的所有数据从回收站里恢复，把它们从不可见状态，重新变回可见。
+2. BE 侧删除一个 tablet 时，默认会把 tablet 的数据放进 BE 回收站。因为某些误操作或者线上 bug，导致 BE 上部分 tablet
被删除，通过运维工具把这些 tablet 从 BE 回收站中抢救回来。
-1. 用户执行命令`drop
database/table/partition`之后，再使用命令`recover`来恢复整个数据库/表/分区的所有数据。这种修复将会把 FE
上的数据库/表/分区的结构，从 catalog 回收站里恢复过来，把它们从不可见状态，重新变回可见，并且原来的数据也恢复可见；
-2. 用户因为某些误操作或者线上 bug，导致 BE 上部分 tablet 被删除，通过运维工具把这些 tablet 从 BE 回收站中抢救回来。
-
-上面两个，前者针对的是数据库/表/分区在 FE 上已经不可见，且数据库/表/分区的元数据尚保留在 FE 的 catalog
回收站里。而后者针对的是数据库/表/分区在 FE 上可见，但部分 BE tablet 数据被删除。
+上面两个，前者针对的是数据库/表/分区在 FE 上已经不可见，且数据库/表/分区的元数据尚保留在 FE 的回收站里。而后者针对的是数据库/表/分区在 FE
上可见，但部分 BE tablet 数据被删除。
下面分别阐述这两种恢复。
-## Drop 恢复
+## 从 FE 回收站恢复
Doris 为了避免误操作造成的灾难，支持对误删除的数据库/表/分区进行数据恢复，在 drop table 或者 drop database 或者 drop
partition 之后，Doris 不会立刻对数据进行物理删除，而是在 FE 的 catalog 回收站中保留一段时间（默认 1 天，可通过 fe.conf
中`catalog_trash_expire_second`参数配置），管理员可以通过 RECOVER 命令对误删除的数据进行恢复。
@@ -52,7 +50,7 @@ SHOW CATALOG RECYCLE BIN [ WHERE NAME [ = "name" | LIKE
"name_matcher"] ]
这里 name 可以是数据库/表/分区名。
-关于该命令使用的更多详细语法及最佳实践，请参阅
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-reference/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
命令手册，你也可以在 MySql 客户端命令行下输入 `help SHOW CATALOG RECYCLE BIN ` 获取更多帮助信息。
+关于该命令使用的更多详细语法及最佳实践，请参阅
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-statements/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
命令手册，你也可以在 MySql 客户端命令行下输入 `help SHOW CATALOG RECYCLE BIN ` 获取更多帮助信息。
### 开始数据恢复
@@ -78,7 +76,7 @@ RECOVER PARTITION p1 FROM example_tbl;
关于 RECOVER 使用的更多详细语法及最佳实践，请参阅
[RECOVER](../../sql-manual/sql-statements/Database-Administration-Statements/RECOVER.md)
命令手册，你也可以在 MySql 客户端命令行下输入 `help RECOVER` 获取更多帮助信息。
-## BE tablet 数据恢复
+## 从 BE 回收站恢复 Tablet
### 从 BE 回收站中恢复数据
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-3.0/admin-manual/data-admin/recyclebin.md
similarity index 88%
rename from
i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/delete-recover.md
rename to
i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/admin-manual/data-admin/recyclebin.md
index e2c7b0da66..53a7f5b183 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-3.0/admin-manual/data-admin/recyclebin.md
@@ -1,6 +1,6 @@
---
{
- "title": "数据删除恢复",
+ "title": "从回收站恢复",
"language": "zh-CN"
}
---
@@ -24,18 +24,16 @@ specific language governing permissions and limitations
under the License.
-->
-# 数据删除恢复
+## 数据生命周期
-数据删除恢复包含两种情况：
+1. 用户执行命令`drop database/table/partition`之后，Doris
会把删除的数据库/表/分区放到回收站，可以使用命令`recover`来恢复整个数据库/表/分区的所有数据从回收站里恢复，把它们从不可见状态，重新变回可见。
+2. BE 侧删除一个 tablet 时，默认会把 tablet 的数据放进 BE 回收站。因为某些误操作或者线上 bug，导致 BE 上部分 tablet
被删除，通过运维工具把这些 tablet 从 BE 回收站中抢救回来。
-1. 用户执行命令`drop
database/table/partition`之后，再使用命令`recover`来恢复整个数据库/表/分区的所有数据。这种修复将会把 FE
上的数据库/表/分区的结构，从 catalog 回收站里恢复过来，把它们从不可见状态，重新变回可见，并且原来的数据也恢复可见；
-2. 用户因为某些误操作或者线上 bug，导致 BE 上部分 tablet 被删除，通过运维工具把这些 tablet 从 BE 回收站中抢救回来。
-
-上面两个，前者针对的是数据库/表/分区在 FE 上已经不可见，且数据库/表/分区的元数据尚保留在 FE 的 catalog
回收站里。而后者针对的是数据库/表/分区在 FE 上可见，但部分 BE tablet 数据被删除。
+上面两个，前者针对的是数据库/表/分区在 FE 上已经不可见，且数据库/表/分区的元数据尚保留在 FE 的回收站里。而后者针对的是数据库/表/分区在 FE
上可见，但部分 BE tablet 数据被删除。
下面分别阐述这两种恢复。
-## Drop 恢复
+## 从 FE 回收站恢复
Doris 为了避免误操作造成的灾难，支持对误删除的数据库/表/分区进行数据恢复，在 drop table 或者 drop database 或者 drop
partition 之后，Doris 不会立刻对数据进行物理删除，而是在 FE 的 catalog 回收站中保留一段时间（默认 1 天，可通过 fe.conf
中`catalog_trash_expire_second`参数配置），管理员可以通过 RECOVER 命令对误删除的数据进行恢复。
@@ -52,7 +50,7 @@ SHOW CATALOG RECYCLE BIN [ WHERE NAME [ = "name" | LIKE
"name_matcher"] ]
这里 name 可以是数据库/表/分区名。
-关于该命令使用的更多详细语法及最佳实践，请参阅
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-reference/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
命令手册，你也可以在 MySql 客户端命令行下输入 `help SHOW CATALOG RECYCLE BIN ` 获取更多帮助信息。
+关于该命令使用的更多详细语法及最佳实践，请参阅
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-statements/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
命令手册，你也可以在 MySql 客户端命令行下输入 `help SHOW CATALOG RECYCLE BIN ` 获取更多帮助信息。
### 开始数据恢复
@@ -78,7 +76,7 @@ RECOVER PARTITION p1 FROM example_tbl;
关于 RECOVER 使用的更多详细语法及最佳实践，请参阅
[RECOVER](../../sql-manual/sql-statements/Database-Administration-Statements/RECOVER.md)
命令手册，你也可以在 MySql 客户端命令行下输入 `help RECOVER` 获取更多帮助信息。
-## BE tablet 数据恢复
+## 从 BE 回收站恢复 Tablet
### 从 BE 回收站中恢复数据
diff --git a/sidebars.json b/sidebars.json
index 2b49d18a5f..1f74e50967 100644
--- a/sidebars.json
+++ b/sidebars.json
@@ -360,8 +360,8 @@
"items": [
"admin-manual/data-admin/backup",
"admin-manual/data-admin/restore",
- "admin-manual/data-admin/delete-recover",
"admin-manual/data-admin/ccr",
+ "admin-manual/data-admin/recyclebin",
"admin-manual/data-admin/repairing-data"
]
},
diff --git
a/versioned_docs/version-2.0/admin-manual/data-admin/delete-recover.md
b/versioned_docs/version-2.0/admin-manual/data-admin/recyclebin.md
similarity index 87%
rename from versioned_docs/version-2.0/admin-manual/data-admin/delete-recover.md
rename to versioned_docs/version-2.0/admin-manual/data-admin/recyclebin.md
index 16550f1997..09e09519ff 100644
--- a/versioned_docs/version-2.0/admin-manual/data-admin/delete-recover.md
+++ b/versioned_docs/version-2.0/admin-manual/data-admin/recyclebin.md
@@ -1,6 +1,6 @@
---
{
- "title": "Data Recover",
+ "title": "Recover from Recycle Bin",
"language": "en"
}
---
@@ -24,19 +24,17 @@ specific language governing permissions and limitations
under the License.
-->
-# Data Deletion Recovery
+## Data Lifecycle
-Data deletion recovery includes two situations:
+1. When a user executes the `drop database/table/partition` command, Doris
moves the deleted database, table, or partition to the recycle bin. The recover
command can be used to restore all data of the deleted database, table, or
partition from the recycle bin, making them visible again.
-1. After executing the command `drop database/table/partition`, user can use
command `recover` to recover all the data in the entire
database/table/partition. It will restore the metadata of the
database/table/partition from the FE's catalog recycle bin, change them from
invisible to visible again, and the data will also be visible again;
+2. When a tablet is deleted on the BE side, its data is moved to the BE
recycle bin by default. In case of accidental operations or online bugs that
result in some tablets being deleted on the BE, these tablets can be recovered
from the BE recycle bin using maintenance tools.
-2. Due to some misoperations or online bugs, some tablets on BEs are deleted,
and these tablets can be rescued from the BE's trash through maintenance tools.
-
-The above two, the former is aimed at the fact that the
database/table/partition is no longer visible on FE, and the metadata of the
database/table/partition is still kept in the catalog recycle bin of FE. The
latter is aimed at databases/tables/partitions that are visible on FE, but some
BE tablet data is deleted.
+In the above scenarios, the first one pertains to the situation where the
database, table, or partition is no longer visible on the FE, but its metadata
is still retained in the FE recycle bin. The second scenario pertains to the
situation where the database, table, or partition is still visible on the FE,
but some BE tablet data has been deleted.
The two recovery methods are described below.
-## Drop Recovery
+## Recover From FE Recycle Bin
In order to avoid disasters caused by misoperation, Doris supports data
recovery of accidentally deleted databases/tables/partitions. After dropping
table or database, Doris will not physically delete the data immediately, but
will keep it in Trash for a period of time ( The default is 1 day, which can be
configured through the `catalog_trash_expire_second` parameter in fe.conf). The
administrator can use the RECOVER command to restore accidentally deleted data.
@@ -75,10 +73,10 @@ RECOVER PARTITION p1 FROM example_tbl;
For more detailed syntax and best practices used by RECOVER, please refer to
the
[RECOVER](../../sql-manual/sql-reference/Database-Administration-Statements/RECOVER.md)
command manual, You can also type `HELP RECOVER` on the MySql client command
line for more help.
-## Tablet Restore Tool
+## Recover Tablet from BE Recycle Bin
-### Restore data from BE Recycle Bin
+### Recover 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 [...]
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/recyclebin.md
similarity index 82%
rename from versioned_docs/version-2.1/admin-manual/data-admin/delete-recover.md
rename to versioned_docs/version-2.1/admin-manual/data-admin/recyclebin.md
index d46922b94a..e48ec7d64c 100644
--- a/versioned_docs/version-2.1/admin-manual/data-admin/delete-recover.md
+++ b/versioned_docs/version-2.1/admin-manual/data-admin/recyclebin.md
@@ -1,6 +1,6 @@
---
{
- "title": "Data Recover",
+ "title": "Recover from Recycle Bin",
"language": "en"
}
---
@@ -24,19 +24,17 @@ specific language governing permissions and limitations
under the License.
-->
-# Data Deletion Recovery
+## Data Lifecycle
-Data deletion recovery includes two situations：
+1. When a user executes the `drop database/table/partition` command, Doris
moves the deleted database, table, or partition to the recycle bin. The recover
command can be used to restore all data of the deleted database, table, or
partition from the recycle bin, making them visible again.
-1. After executing the command `drop database/table/partition`, user can use
command `recover` to recover all the data in the entire
database/table/partition. It will restore the metadata of the
database/table/partition from the FE's catalog recycle bin, change them from
invisible to visible again, and the data will also be visible again;
+2. When a tablet is deleted on the BE side, its data is moved to the BE
recycle bin by default. In case of accidental operations or online bugs that
result in some tablets being deleted on the BE, these tablets can be recovered
from the BE recycle bin using maintenance tools.
-2. Due to some misoperations or online bugs, some tablets on BEs are deleted,
and these tablets can be rescued from the BE's trash through maintenance tools.
-
-The above two, the former is aimed at the fact that the
database/table/partition is no longer visible on FE, and the metadata of the
database/table/partition is still kept in the catalog recycle bin of FE. The
latter is aimed at databases/tables/partitions that are visible on FE, but some
BE tablet data is deleted.
+In the above scenarios, the first one pertains to the situation where the
database, table, or partition is no longer visible on the FE, but its metadata
is still retained in the FE recycle bin. The second scenario pertains to the
situation where the database, table, or partition is still visible on the FE,
but some BE tablet data has been deleted.
The two recovery methods are described below.
-## Drop Recovery
+## Recover from FE Recycle Bin
In order to avoid disasters caused by misoperation, Doris supports data
recovery of accidentally deleted databases/tables/partitions. After dropping
table or database, Doris will not physically delete the data immediately, but
will keep it in Trash for a period of time ( The default is 1 day, which can be
configured through the `catalog_trash_expire_second` parameter in fe.conf). The
administrator can use the RECOVER command to restore accidentally deleted data.
@@ -50,7 +48,7 @@ Query FE catalog recycle bin
SHOW CATALOG RECYCLE BIN [ WHERE NAME [ = "name" | LIKE "name_matcher"] ]
```
-For more detailed syntax and best practices, please refer to the
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-reference/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
command manual, You can also type `help SHOW CATALOG RECYCLE BIN` on the MySql
client command line for more help.
+For more detailed syntax and best practices, please refer to the
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-statements/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
command manual, You can also type `help SHOW CATALOG RECYCLE BIN` on the MySql
client command line for more help.
### Start Data Recovery
@@ -73,12 +71,12 @@ RECOVER TABLE example_db.example_tbl;
RECOVER PARTITION p1 FROM example_tbl;
```
-For more detailed syntax and best practices used by RECOVER, please refer to
the
[RECOVER](../../sql-manual/sql-reference/Database-Administration-Statements/RECOVER.md)
command manual, You can also type `HELP RECOVER` on the MySql client command
line for more help.
+For more detailed syntax and best practices used by RECOVER, please refer to
the
[RECOVER](../../sql-manual/sql-statements/Database-Administration-Statements/RECOVER.md)
command manual, You can also type `HELP RECOVER` on the MySql client command
line for more help.
-## Tablet Restore Tool
+## Recover from Be Recycle Bin
-### Restore data from BE Recycle Bin
+### Recover 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 [...]
diff --git
a/versioned_docs/version-3.0/admin-manual/data-admin/delete-recover.md
b/versioned_docs/version-3.0/admin-manual/data-admin/recyclebin.md
similarity index 82%
rename from versioned_docs/version-3.0/admin-manual/data-admin/delete-recover.md
rename to versioned_docs/version-3.0/admin-manual/data-admin/recyclebin.md
index d46922b94a..5b5abd62ff 100644
--- a/versioned_docs/version-3.0/admin-manual/data-admin/delete-recover.md
+++ b/versioned_docs/version-3.0/admin-manual/data-admin/recyclebin.md
@@ -1,6 +1,6 @@
---
{
- "title": "Data Recover",
+ "title": "Recover from Recycle Bin",
"language": "en"
}
---
@@ -24,19 +24,17 @@ specific language governing permissions and limitations
under the License.
-->
-# Data Deletion Recovery
+## Data Lifecycle
-Data deletion recovery includes two situations：
+1. When a user executes the `drop database/table/partition` command, Doris
moves the deleted database, table, or partition to the recycle bin. The recover
command can be used to restore all data of the deleted database, table, or
partition from the recycle bin, making them visible again.
-1. After executing the command `drop database/table/partition`, user can use
command `recover` to recover all the data in the entire
database/table/partition. It will restore the metadata of the
database/table/partition from the FE's catalog recycle bin, change them from
invisible to visible again, and the data will also be visible again;
+2. When a tablet is deleted on the BE side, its data is moved to the BE
recycle bin by default. In case of accidental operations or online bugs that
result in some tablets being deleted on the BE, these tablets can be recovered
from the BE recycle bin using maintenance tools.
-2. Due to some misoperations or online bugs, some tablets on BEs are deleted,
and these tablets can be rescued from the BE's trash through maintenance tools.
-
-The above two, the former is aimed at the fact that the
database/table/partition is no longer visible on FE, and the metadata of the
database/table/partition is still kept in the catalog recycle bin of FE. The
latter is aimed at databases/tables/partitions that are visible on FE, but some
BE tablet data is deleted.
+In the above scenarios, the first one pertains to the situation where the
database, table, or partition is no longer visible on the FE, but its metadata
is still retained in the FE recycle bin. The second scenario pertains to the
situation where the database, table, or partition is still visible on the FE,
but some BE tablet data has been deleted.
The two recovery methods are described below.
-## Drop Recovery
+## Recover from FE Recycle Bin
In order to avoid disasters caused by misoperation, Doris supports data
recovery of accidentally deleted databases/tables/partitions. After dropping
table or database, Doris will not physically delete the data immediately, but
will keep it in Trash for a period of time ( The default is 1 day, which can be
configured through the `catalog_trash_expire_second` parameter in fe.conf). The
administrator can use the RECOVER command to restore accidentally deleted data.
@@ -50,7 +48,7 @@ Query FE catalog recycle bin
SHOW CATALOG RECYCLE BIN [ WHERE NAME [ = "name" | LIKE "name_matcher"] ]
```
-For more detailed syntax and best practices, please refer to the
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-reference/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
command manual, You can also type `help SHOW CATALOG RECYCLE BIN` on the MySql
client command line for more help.
+For more detailed syntax and best practices, please refer to the
[SHOW-CATALOG-RECYCLE-BIN](../../sql-manual/sql-statements/Show-Statements/SHOW-CATALOG-RECYCLE-BIN.md)
command manual, You can also type `help SHOW CATALOG RECYCLE BIN` on the MySql
client command line for more help.
### Start Data Recovery
@@ -73,12 +71,12 @@ RECOVER TABLE example_db.example_tbl;
RECOVER PARTITION p1 FROM example_tbl;
```
-For more detailed syntax and best practices used by RECOVER, please refer to
the
[RECOVER](../../sql-manual/sql-reference/Database-Administration-Statements/RECOVER.md)
command manual, You can also type `HELP RECOVER` on the MySql client command
line for more help.
+For more detailed syntax and best practices used by RECOVER, please refer to
the
[RECOVER](../../sql-manual/sql-statements/Database-Administration-Statements/RECOVER.md)
command manual, You can also type `HELP RECOVER` on the MySql client command
line for more help.
-## Tablet Restore Tool
+## Recover Tablet from BE Recycle Bin
-### Restore data from BE Recycle Bin
+### Recover 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 [...]
diff --git a/versioned_sidebars/version-2.0-sidebars.json
b/versioned_sidebars/version-2.0-sidebars.json
index 54f9390eb3..73a006297b 100644
--- a/versioned_sidebars/version-2.0-sidebars.json
+++ b/versioned_sidebars/version-2.0-sidebars.json
@@ -300,9 +300,9 @@
"items": [
"admin-manual/data-admin/backup",
"admin-manual/data-admin/restore",
- "admin-manual/data-admin/data-recovery",
- "admin-manual/data-admin/delete-recover",
- "admin-manual/data-admin/ccr"
+ "admin-manual/data-admin/ccr",
+ "admin-manual/data-admin/recyclebin",
+ "admin-manual/data-admin/data-recovery"
]
},
{
diff --git a/versioned_sidebars/version-2.1-sidebars.json
b/versioned_sidebars/version-2.1-sidebars.json
index 0bcf2970c9..793b142454 100644
--- a/versioned_sidebars/version-2.1-sidebars.json
+++ b/versioned_sidebars/version-2.1-sidebars.json
@@ -332,9 +332,9 @@
"items": [
"admin-manual/data-admin/backup",
"admin-manual/data-admin/restore",
- "admin-manual/data-admin/data-recovery",
- "admin-manual/data-admin/delete-recover",
- "admin-manual/data-admin/ccr"
+ "admin-manual/data-admin/ccr",
+ "admin-manual/data-admin/recyclebin",
+ "admin-manual/data-admin/data-recovery"
]
},
{
diff --git a/versioned_sidebars/version-3.0-sidebars.json
b/versioned_sidebars/version-3.0-sidebars.json
index ec6038160b..d5fa282479 100644
--- a/versioned_sidebars/version-3.0-sidebars.json
+++ b/versioned_sidebars/version-3.0-sidebars.json
@@ -348,8 +348,8 @@
"items": [
"admin-manual/data-admin/backup",
"admin-manual/data-admin/restore",
- "admin-manual/data-admin/delete-recover",
"admin-manual/data-admin/ccr",
+ "admin-manual/data-admin/recyclebin",
"admin-manual/data-admin/repairing-data"
]
},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
