This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit b9a87c63f768c001d7c2361bc333f67330aa1476
Author: walter <w41te...@gmail.com>
AuthorDate: Thu Feb 29 15:24:47 2024 +0800
[chore](catalog recycle bin) Add option to ignore min erase latency for
testing (#31417)
---
fe/fe-common/src/main/java/org/apache/doris/common/Config.java | 3 +++
.../src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
index 45bf426984b..cbbf9368720 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
@@ -703,6 +703,9 @@ public class Config extends ConfigBase {
"And this specifies the maximal data retention time. After time,
the data will be deleted permanently."})
public static long catalog_trash_expire_second = 86400L; // 1day
+ @ConfField
+ public static boolean catalog_trash_ignore_min_erase_latency = false;
+
@ConfField(mutable = true, masterOnly = true, description = {
"单个 broker scanner 读取的最小字节数。Broker Load 切分文件时，"
+ "如果切分后的文件大小小于此值，将不会切分。",
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java
index 51a0c5ba932..5a6703f6e5c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java
@@ -220,7 +220,8 @@ public class CatalogRecycleBin extends MasterDaemon
implements Writable {
private synchronized boolean isExpire(long id, long currentTimeMs) {
long latency = currentTimeMs - idToRecycleTime.get(id);
- return latency > minEraseLatency && latency >
Config.catalog_trash_expire_second * 1000L;
+ return (Config.catalog_trash_ignore_min_erase_latency || latency >
minEraseLatency)
+ && latency > Config.catalog_trash_expire_second * 1000L;
}
private synchronized void eraseDatabase(long currentTimeMs, int keepNum) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
