Skip to content

Commit d3e14b3

Browse files
committed
fix
1 parent 89558a7 commit d3e14b3

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

fe/fe-core/src/main/java/org/apache/doris/catalog/LocalTablet.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.apache.doris.catalog;
1919

2020
import org.apache.doris.common.Pair;
21-
import org.apache.doris.common.lock.MonitoredReentrantReadWriteLock;
2221

2322
import com.google.gson.annotations.SerializedName;
2423
import org.apache.logging.log4j.LogManager;
@@ -34,7 +33,7 @@ public class LocalTablet extends Tablet {
3433
private long cooldownReplicaId = -1;
3534
@SerializedName(value = "ctm", alternate = {"cooldownTerm"})
3635
private long cooldownTerm = -1;
37-
private MonitoredReentrantReadWriteLock cooldownConfLock = new MonitoredReentrantReadWriteLock();
36+
private final Object cooldownConfLock = new Object();
3837

3938
public LocalTablet() {
4039
}
@@ -44,22 +43,19 @@ public LocalTablet(long tabletId) {
4443
}
4544

4645
public void setCooldownConf(long cooldownReplicaId, long cooldownTerm) {
47-
cooldownConfLock.writeLock().lock();
48-
this.cooldownReplicaId = cooldownReplicaId;
49-
this.cooldownTerm = cooldownTerm;
50-
cooldownConfLock.writeLock().unlock();
46+
synchronized (cooldownConfLock) {
47+
this.cooldownReplicaId = cooldownReplicaId;
48+
this.cooldownTerm = cooldownTerm;
49+
}
5150
}
5251

5352
public long getCooldownReplicaId() {
5453
return cooldownReplicaId;
5554
}
5655

5756
public Pair<Long, Long> getCooldownConf() {
58-
cooldownConfLock.readLock().lock();
59-
try {
57+
synchronized (cooldownConfLock) {
6058
return Pair.of(cooldownReplicaId, cooldownTerm);
61-
} finally {
62-
cooldownConfLock.readLock().unlock();
6359
}
6460
}
6561

fe/fe-core/src/test/java/org/apache/doris/cloud/cache/CacheHotspotManagerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
package org.apache.doris.cloud.cache;
1919

20-
import org.apache.doris.catalog.LocalTablet;
2120
import org.apache.doris.catalog.MaterializedIndex;
2221
import org.apache.doris.catalog.MaterializedIndex.IndexExtState;
2322
import org.apache.doris.catalog.Partition;
2423
import org.apache.doris.catalog.Tablet;
2524
import org.apache.doris.cloud.CacheHotspotManager;
25+
import org.apache.doris.cloud.catalog.CloudTablet;
2626
import org.apache.doris.cloud.system.CloudSystemInfoService;
2727
import org.apache.doris.common.Triple;
2828
import org.apache.doris.system.Backend;
@@ -90,7 +90,7 @@ List<Backend> getBackendsFromCluster(String dstClusterName) {
9090
@Mock
9191
public List<Tablet> getTabletsFromIndexs(List<MaterializedIndex> indexes) {
9292
List<Tablet> list = new ArrayList<>();
93-
Tablet tablet = new LocalTablet(1001L);
93+
Tablet tablet = new CloudTablet(1001L);
9494
list.add(tablet);
9595
return list;
9696
}

0 commit comments

Comments
 (0)