EmmyMiao87 commented on a change in pull request #6323:
URL: https://github.com/apache/incubator-doris/pull/6323#discussion_r681386849
##########
File path: docs/en/administrator-guide/operation/disk-capacity.md
##########
@@ -131,12 +131,13 @@ When the disk capacity is higher than High Watermark or
even Flood Stage, many o
**This operation will affect [Restore data from BE Recycle
Bin](./tablet-restore-tool.md).**
- If the BE can still be started, you can use `CLEAN TRASH
ON(BackendHost:BackendHeartBeatPort)` to actively clean up temporary files.
There are two situations as follows:
+ If the BE can still be started, you can use `CLEAN TRASH
ON(BackendHost:BackendHeartBeatPort);` to actively clean up temporary files.
**all trash files** and expired snapshot files will be cleaned up, **This will
affect the operation of restoring data from the trash bin**.
Review comment:
```suggestion
If the BE can still be started, you can use `ADMIN CLEAN TRASH
ON(BackendHost:BackendHeartBeatPort);` to actively clean up temporary files.
**all trash files** and expired snapshot files will be cleaned up, **This will
affect the operation of restoring data from the trash bin**.
```
##########
File path: docs/zh-CN/administrator-guide/operation/disk-capacity.md
##########
@@ -129,11 +129,11 @@ capacity_min_left_bytes_flood_stage 默认 1GB。
**这种操作会对 [从 BE 回收站中恢复数据](./tablet-restore-tool.md) 产生影响。**
- 如果BE还能够启动，则可以使用`CLEAN TRASH
ON(BackendHost:BackendHeartBeatPort)`来主动清理临时文件，这里分为如下两种情况：
- * 如果磁盘占用未达到 **危险水位(Flood Stage)**
的90%，则会清理过期trash文件和过期snapshot文件，此时会保留一些近期文件而不影响恢复数据。
- * 如果磁盘占用已达到 **危险水位(Flood Stage)** 的90%，则会清理 **所有** trash文件和过期snapshot文件，
**此时也会影响从回收站恢复数据的操作** 。
+ 如果BE还能够启动，则可以使用`CLEAN TRASH
ON(BackendHost:BackendHeartBeatPort);`来主动清理临时文件，会清理 **所有**
trash文件和过期snapshot文件，**这将影响从回收站恢复数据的操作** 。
- 如果不手动执行`CLEAN TRASH`，系统仍将会在几分钟至几十分钟内自动执行清理。
+ 如果不手动执行`CLEAN TRASH`，系统仍将会在几分钟至几十分钟内自动执行清理，这里分为两种情况：
Review comment:
same as above
##########
File path: docs/en/administrator-guide/operation/disk-capacity.md
##########
@@ -131,12 +131,13 @@ When the disk capacity is higher than High Watermark or
even Flood Stage, many o
**This operation will affect [Restore data from BE Recycle
Bin](./tablet-restore-tool.md).**
- If the BE can still be started, you can use `CLEAN TRASH
ON(BackendHost:BackendHeartBeatPort)` to actively clean up temporary files.
There are two situations as follows:
+ If the BE can still be started, you can use `CLEAN TRASH
ON(BackendHost:BackendHeartBeatPort);` to actively clean up temporary files.
**all trash files** and expired snapshot files will be cleaned up, **This will
affect the operation of restoring data from the trash bin**.
+
+
+ If you do not manually execute `CLEAN TRASH`, the system will still
automatically execute the cleanup within a few minutes to tens of minutes.There
are two situations as follows:
Review comment:
```suggestion
If you do not manually execute `ADMIN CLEAN TRASH`, the system will
still automatically execute the cleanup within a few minutes to tens of
minutes.There are two situations as follows:
```
##########
File path: be/src/service/backend_service.cpp
##########
@@ -340,6 +340,6 @@ void
BackendService::get_stream_load_record(TStreamLoadRecordResult& result,
}
void BackendService::clean_trash() {
- StorageEngine::instance()->start_trash_sweep(nullptr); // do not update
usage
+ StorageEngine::instance()->start_trash_sweep(nullptr, true); // do not
update usage, ignore guard_space
Review comment:
```suggestion
StorageEngine::instance()->start_trash_sweep(nullptr, true); // update
usage, ignore guard_space
```
##########
File path: docs/zh-CN/administrator-guide/operation/disk-capacity.md
##########
@@ -129,11 +129,11 @@ capacity_min_left_bytes_flood_stage 默认 1GB。
**这种操作会对 [从 BE 回收站中恢复数据](./tablet-restore-tool.md) 产生影响。**
- 如果BE还能够启动，则可以使用`CLEAN TRASH
ON(BackendHost:BackendHeartBeatPort)`来主动清理临时文件，这里分为如下两种情况：
- * 如果磁盘占用未达到 **危险水位(Flood Stage)**
的90%，则会清理过期trash文件和过期snapshot文件，此时会保留一些近期文件而不影响恢复数据。
- * 如果磁盘占用已达到 **危险水位(Flood Stage)** 的90%，则会清理 **所有** trash文件和过期snapshot文件，
**此时也会影响从回收站恢复数据的操作** 。
+ 如果BE还能够启动，则可以使用`CLEAN TRASH
ON(BackendHost:BackendHeartBeatPort);`来主动清理临时文件，会清理 **所有**
trash文件和过期snapshot文件，**这将影响从回收站恢复数据的操作** 。
Review comment:
same as above
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
