database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[opt](fe) Use table.readLock in TabletStatMgr for updating statistics (#39612) (#43937)

Browse Source
This commit is contained in:
Lei Zhang
2024-11-14 19:44:16 +08:00
committed by GitHub
parent 26fef2a02a
commit 8554c06337
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
View File

@ -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);

12
fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java
View File

@ -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();
}
}
}