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

Revert "[chore](log) add try lock db failed log (#34503)"

Browse Source 
This reverts commit e34860b86a1cf0e5aa7afa3633fa3772230e2024.
This commit is contained in:
yiguolei
2024-05-10 17:34:43 +08:00
parent 435b4343d7
commit 89091363d9
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java
View File

@ -30,8 +30,6 @@ import org.apache.doris.common.io.Text;
import org.apache.doris.common.io.Writable;
import org.apache.doris.common.util.DebugUtil;
import org.apache.doris.common.util.PropertyAnalyzer;
import org.apache.doris.common.util.QueryableReentrantReadWriteLock;
import org.apache.doris.common.util.Util;
import org.apache.doris.datasource.CatalogIf;
import org.apache.doris.persist.CreateTableInfo;
import org.apache.doris.persist.gson.GsonUtils;
@ -60,6 +58,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.stream.Collectors;
/**
@ -84,8 +83,7 @@ public class Database extends MetaObject implements Writable, DatabaseIf<Table>
private long id;
@SerializedName(value = "fullQualifiedName")
private volatile String fullQualifiedName;
private QueryableReentrantReadWriteLock rwLock;
private final ReentrantReadWriteLock rwLock;
// table family group map
private final Map<Long, Table> idToTable;
@ -135,7 +133,7 @@ public class Database extends MetaObject implements Writable, DatabaseIf<Table>
if (this.fullQualifiedName == null) {
this.fullQualifiedName = "";
}
this.rwLock = new QueryableReentrantReadWriteLock(true);
this.rwLock = new ReentrantReadWriteLock(true);
this.idToTable = Maps.newConcurrentMap();
this.nameToTable = Maps.newConcurrentMap();
this.lowerCaseToTableName = Maps.newConcurrentMap();
@ -175,14 +173,7 @@ public class Database extends MetaObject implements Writable, DatabaseIf<Table>
public boolean tryWriteLock(long timeout, TimeUnit unit) {
try {
if (!this.rwLock.writeLock().tryLock(timeout, unit)) {
Thread owner = this.rwLock.getOwner();
if (owner != null) {
LOG.info("database[{}] lock is held by: {}", getName(), Util.dumpThread(owner, 10));
}
return false;
}
return true;
return this.rwLock.writeLock().tryLock(timeout, unit);
} catch (InterruptedException e) {
LOG.warn("failed to try write lock at db[" + id + "]", e);
return false;