MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

restore order: first validate nested index, then disable uptodate check, then take the lock to avoid deadlock (for IDEA-CR-33212)

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-06-04 18:04:38 +03:00
parent c97de83fc6
commit dbc54bc5a8
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
+13 -10
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.vfs.newvfs.ManagingFS;
import com.intellij.openapi.vfs.newvfs.persistent.PersistentFS;
import com.intellij.psi.PsiElement;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.Processor;
import com.intellij.util.Processors;
import com.intellij.util.SmartList;
@@ -334,16 +335,18 @@ public class StubIndexImpl extends StubIndex implements PersistentStateComponent
UpdatableIndex<Integer, SerializedStubTree, FileContent> stubUpdatingIndex = fileBasedIndex.getIndex(stubUpdatingIndexId);
try {
stubUpdatingIndex.getReadLock().lock();
try {
// disable up-to-date check to avoid locks on attempt to acquire index write lock while holding at the same time the readLock for this index
return FileBasedIndexImpl.disableUpToDateCheckIn(()->
myAccessValidator.validate(stubUpdatingIndexId, ()->index.getData(key).forEach(action)));
}
finally {
stubUpdatingIndex.getReadLock().unlock();
wipeProblematicFileIdsForParticularKeyAndStubIndex(indexKey, key, stubUpdatingIndex);
}
return myAccessValidator.validate(stubUpdatingIndexId, ()-> {
try {
return FileBasedIndexImpl.disableUpToDateCheckIn(() ->
ConcurrencyUtil.withLock(stubUpdatingIndex.getReadLock(), () ->
// disable up-to-date check to avoid locks on attempt to acquire index write lock while holding at the same time the readLock for this index
index.getData(key).forEach(action)
));
}
finally {
wipeProblematicFileIdsForParticularKeyAndStubIndex(indexKey, key, stubUpdatingIndex);
}
});
}
catch (StorageException e) {
forceRebuild(e);