Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix concurrent cache access (#1425)

This commit is contained in:
Guillaume Nodet 2024-02-29 00:31:49 +01:00 committed by GitHub
parent 5307bcba09
commit ce15193394
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
View File

@ -195,27 +195,30 @@ public class LifecycleDependencyResolver {
boolean aggregating,
Set<Artifact> projectArtifacts)
throws LifecycleExecutionException {
Set<Artifact> resolvedArtifacts;
ProjectArtifactsCache.Key cacheKey = projectArtifactsCache.createKey(
project, scopesToCollect, scopesToResolve, aggregating, session.getRepositorySession());
ProjectArtifactsCache.CacheRecord recordArtifacts;
recordArtifacts = projectArtifactsCache.get(cacheKey);
if (recordArtifacts != null) {
resolvedArtifacts = recordArtifacts.getArtifacts();
} else {
try {
resolvedArtifacts = getDependencies(
project, scopesToCollect, scopesToResolve, session, aggregating, projectArtifacts);
recordArtifacts = projectArtifactsCache.put(cacheKey, resolvedArtifacts);
} catch (LifecycleExecutionException e) {
projectArtifactsCache.put(cacheKey, e);
projectArtifactsCache.register(project, cacheKey, recordArtifacts);
throw e;
if (recordArtifacts == null) {
synchronized (cacheKey) {
recordArtifacts = projectArtifactsCache.get(cacheKey);
if (recordArtifacts == null) {
try {
Set<Artifact> resolvedArtifacts = getDependencies(
project, scopesToCollect, scopesToResolve, session, aggregating, projectArtifacts);
recordArtifacts = projectArtifactsCache.put(cacheKey, resolvedArtifacts);
} catch (LifecycleExecutionException e) {
projectArtifactsCache.put(cacheKey, e);
projectArtifactsCache.register(project, cacheKey, recordArtifacts);
throw e;
}
}
}
}
projectArtifactsCache.register(project, cacheKey, recordArtifacts);
return resolvedArtifacts;
return recordArtifacts.getArtifacts();
}
private Set<Artifact> getDependencies(

31
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
View File

@ -49,13 +49,14 @@ import org.eclipse.aether.repository.WorkspaceRepository;
public class DefaultPluginDescriptorCache implements PluginDescriptorCache {
private Map<Key, PluginDescriptor> descriptors = new ConcurrentHashMap<>(128);
private Map<Key, Key> keys = new ConcurrentHashMap<>();
public void flush() {
descriptors.clear();
}
public Key createKey(Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session) {
return new CacheKey(plugin, repositories, session);
return keys.computeIfAbsent(new CacheKey(plugin, repositories, session), k -> k);
}
public PluginDescriptor get(Key cacheKey) {
@ -65,26 +66,20 @@ public class DefaultPluginDescriptorCache implements PluginDescriptorCache {
@Override
public PluginDescriptor get(Key key, PluginDescriptorSupplier supplier)
throws PluginDescriptorParsingException, PluginResolutionException, InvalidPluginDescriptorException {
try {
return clone(descriptors.computeIfAbsent(key, k -> {
try {
return clone(supplier.load());
} catch (PluginDescriptorParsingException
| PluginResolutionException
| InvalidPluginDescriptorException e) {
throw new RuntimeException(e);
PluginDescriptor desc = descriptors.get(key);
if (desc == null) {
synchronized (key) {
desc = descriptors.get(key);
if (desc == null) {
desc = supplier.load();
descriptors.putIfAbsent(key, clone(desc));
}
}
}));
} catch (RuntimeException e) {
if (e.getCause() instanceof PluginDescriptorParsingException) {
throw (PluginDescriptorParsingException) e.getCause();
}
if (e.getCause() instanceof PluginResolutionException) {
throw (PluginResolutionException) e.getCause();
}
if (e.getCause() instanceof InvalidPluginDescriptorException) {
throw (InvalidPluginDescriptorException) e.getCause();
}
return clone(desc);
} catch (PluginDescriptorParsingException | PluginResolutionException | InvalidPluginDescriptorException e) {
throw e;
}
}

4
maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
View File

@ -159,6 +159,7 @@ public class DefaultProjectArtifactsCache implements ProjectArtifactsCache {
}
protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<>();
protected final Map<Key, Key> keys = new ConcurrentHashMap<>();
@Override
public Key createKey(
@ -167,13 +168,14 @@ public class DefaultProjectArtifactsCache implements ProjectArtifactsCache {
Collection<String> scopesToResolve,
boolean aggregating,
RepositorySystemSession session) {
return new CacheKey(
Key key = new CacheKey(
project,
project.getRemoteProjectRepositories(),
scopesToCollect,
scopesToResolve,
aggregating,
session);
return keys.computeIfAbsent(key, k -> k);
}
@Override