diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/CloudTabletStatMgr.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/CloudTabletStatMgr.java index 8bd05213e0fa9d1..ff01f736081a70c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/CloudTabletStatMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/CloudTabletStatMgr.java @@ -156,7 +156,7 @@ protected void runAfterCatalogReady() { Long tableRowsetCount = 0L; Long tableSegmentCount = 0L; - if (!table.writeLockIfExist()) { + if (!table.readLockIfExist()) { continue; } try { @@ -203,13 +203,14 @@ protected void runAfterCatalogReady() { } // 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, 0L, tableReplicaCount, tableRowCount, tableRowsetCount, tableSegmentCount)); LOG.debug("finished to set row num for table: {} in database: {}", table.getName(), db.getFullName()); } finally { - table.writeUnlock(); + table.readUnlock(); } newCloudTableStatsMap.put(Pair.of(dbId, table.getId()), new OlapTable.Statistics(db.getName(), 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 0665b128bfdc872..c3b2f01448b3983 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 @@ -183,6 +183,15 @@ public void readLock() { } } + 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 030dc4d7a0e9cd8..207f007a4cbb6ae 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 @@ -121,13 +121,7 @@ protected void runAfterCatalogReady() { 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 { @@ -169,6 +163,7 @@ protected void runAfterCatalogReady() { } // 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)); @@ -178,7 +173,7 @@ protected void runAfterCatalogReady() { table.getName(), db.getFullName()); } } finally { - table.writeUnlock(); + table.readUnlock(); } } }