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
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 6c62f284999 branch-2.1: [fix](RecycleBin) fix race condition issue
when do execute ShowCatalogRecycleBinStmt (#35759) (#50654)
6c62f284999 is described below
commit 6c62f284999ef20d369770893d7406237f02ab3f
Author: Mingyu Chen (Rayner) <[email protected]>
AuthorDate: Wed May 7 23:02:16 2025 +0800
branch-2.1: [fix](RecycleBin) fix race condition issue when do execute
ShowCatalogRecycleBinStmt (#35759) (#50654)
bp #35759
Co-authored-by: caiconghui <[email protected]>
Co-authored-by: caiconghui1 <[email protected]>
---
.../src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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 f3d6e2058b9..0642dbd1e15 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
@@ -1014,9 +1014,8 @@ public class CatalogRecycleBin extends MasterDaemon
implements Writable {
eraseDatabase(currentTimeMs, keepNum);
}
- public List<List<String>> getInfo() {
+ public synchronized List<List<String>> getInfo() {
Map<Long, Pair<Long, Long>> dbToDataSize = new HashMap<>();
-
List<List<String>> tableInfos = Lists.newArrayList();
for (Map.Entry<Long, RecycleTableInfo> entry : idToTable.entrySet()) {
List<String> info = Lists.newArrayList();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
