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

[fix](stats) Add synchronize for some analysis maps to avoid ConcurrentModificationException (#35591)

Browse Source 
Add synchronized for analysis related maps to avoid
ConcurrentModificationException. For example, modify the map while
writing image will throw ConcurrentModificationException.
This commit is contained in:
Jibing-Li
2024-05-30 14:27:44 +08:00
committed by yiguolei
parent cb88334e34
commit 3efab570df
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java
View File

@ -935,8 +935,12 @@ public class AnalysisManager implements Writable {
@Override
public void write(DataOutput out) throws IOException {
writeJobInfo(out, analysisJobInfoMap);
writeJobInfo(out, analysisTaskInfoMap);
synchronized (analysisJobInfoMap) {
writeJobInfo(out, analysisJobInfoMap);
}
synchronized (analysisTaskInfoMap) {
writeJobInfo(out, analysisTaskInfoMap);
}
writeTableStats(out);
}
@ -948,9 +952,11 @@ public class AnalysisManager implements Writable {
}
private void writeTableStats(DataOutput out) throws IOException {
out.writeInt(idToTblStats.size());
for (Entry<Long, TableStatsMeta> entry : idToTblStats.entrySet()) {
entry.getValue().write(out);
synchronized (idToTblStats) {
out.writeInt(idToTblStats.size());
for (Entry<Long, TableStatsMeta> entry : idToTblStats.entrySet()) {
entry.getValue().write(out);
}
}
}
@ -997,7 +1003,9 @@ public class AnalysisManager implements Writable {
}
public void replayUpdateTableStatsStatus(TableStatsMeta tableStats) {
idToTblStats.put(tableStats.tblId, tableStats);
synchronized (idToTblStats) {
idToTblStats.put(tableStats.tblId, tableStats);
}
}
public void logCreateTableStats(TableStatsMeta tableStats) {
@ -1042,7 +1050,9 @@ public class AnalysisManager implements Writable {
}
public void removeTableStats(long tableId) {
idToTblStats.remove(tableId);
synchronized (idToTblStats) {
idToTblStats.remove(tableId);
}
}
public ColStatsMeta findColStatsMeta(long tblId, String indexName, String colName) {