This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 8554c06337d [opt](fe) Use `table.readLock` in `TabletStatMgr` for
updating statistics (#39612) (#43937)
8554c06337d is described below
commit 8554c06337d245e7b77cc3de610bf646eebf10b2
Author: Lei Zhang <zhang...@selectdb.com>
AuthorDate: Thu Nov 14 19:44:16 2024 +0800
[opt](fe) Use `table.readLock` in `TabletStatMgr` for updating statistics
(#39612) (#43937)
---
fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java | 9 +++++++++
.../main/java/org/apache/doris/catalog/TabletStatMgr.java | 12 +++---------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
index 8d648df3356..6fc321050c6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
@@ -174,6 +174,15 @@ public abstract class Table extends MetaObject implements
Writable, TableIf {
}
}
+ public boolean readLockIfExist() {
+ readLock();
+ if (isDropped) {
+ readUnlock();
+ return false;
+ }
+ return true;
+ }
+
public boolean tryReadLock(long timeout, TimeUnit unit) {
try {
boolean res = this.rwLock.readLock().tryLock(timeout, unit);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java
index b9093dcd838..7224d66ad44 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java
@@ -34,7 +34,6 @@ import org.apache.logging.log4j.Logger;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.TimeUnit;
/*
* TabletStatMgr is for collecting tablet(replica) statistics from backends.
@@ -114,13 +113,7 @@ public class TabletStatMgr extends MasterDaemon {
Long tableRowCount = 0L;
- // Use try write lock to avoid such cases
- // Time1: Thread1 hold read lock for 5min
- // Time2: Thread2 want to add write lock, then it will be
the first element in lock queue
- // Time3: Thread3 want to add read lock, but it will not,
because thread 2 want to add write lock
- // In this case, thread 3 has to wait more than 5min, because
it has to wait thread 2 to add
- // write lock and release write lock and thread 2 has to wait
thread 1 to release read lock
- if (!table.tryWriteLockIfExist(3000, TimeUnit.MILLISECONDS)) {
+ if (!table.readLockIfExist()) {
continue;
}
try {
@@ -193,6 +186,7 @@ public class TabletStatMgr extends MasterDaemon {
} // end for indices
} // end for partitions
+ // this is only one thread to update table statistics,
readLock is enough
olapTable.setStatistics(new
OlapTable.Statistics(db.getName(), table.getName(),
tableDataSize, tableTotalReplicaDataSize,
tableRemoteDataSize, tableReplicaCount,
tableRowCount, 0L, 0L));
@@ -202,7 +196,7 @@ public class TabletStatMgr extends MasterDaemon {
table.getName(), db.getFullName());
}
} finally {
- table.writeUnlock();
+ table.readUnlock();
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
