Skip to content

Fix concurrent updates to mapped model sources #12766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elharo merged 1 commit into from
Aug 22, 2026
+83 −1
Merged

Fix concurrent updates to mapped model sources #12766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ public ModelSource getSource(String groupId, String artifactId) {

public void putSource(String groupId, String artifactId, ModelSource source) {
mappedSources
.computeIfAbsent(new GAKey(groupId, artifactId), k -> new HashSet<>())
.computeIfAbsent(new GAKey(groupId, artifactId), k -> ConcurrentHashMap.newKeySet())
.add(source);
// Also register the source under the null groupId
if (groupId != null) {
Expand Down
82 changes: 82 additions & 0 deletions impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,17 @@
import java.lang.reflect.Field;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Spliterator;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;

import org.apache.maven.api.RemoteRepository;
import org.apache.maven.api.Session;
Expand All @@ -35,6 +43,7 @@
import org.apache.maven.api.services.ModelBuilder;
import org.apache.maven.api.services.ModelBuilderRequest;
import org.apache.maven.api.services.ModelBuilderResult;
import org.apache.maven.api.services.ModelSource;
import org.apache.maven.api.services.Sources;
import org.apache.maven.impl.standalone.ApiRunner;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -44,6 +53,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

/**
Expand Down Expand Up @@ -73,6 +83,78 @@ public void testPropertiesAndProfiles() {
assertEquals("21", result.getEffectiveModel().getProperties().get("maven.compiler.release"));
}

@Test
void testMappedSourcesSupportsConcurrentUpdates() throws Exception {
ModelBuilderRequest request = ModelBuilderRequest.builder()
.session(session)
.requestType(ModelBuilderRequest.RequestType.BUILD_PROJECT)
.source(Sources.buildSource(getPom("simple-standalone")))
.build();
DefaultModelBuilder.ModelBuilderSessionState state =
((DefaultModelBuilder) builder).new ModelBuilderSessionState(request);

int threadCount = 16;
int sourcesPerThread = 500;
CountDownLatch ready = new CountDownLatch(threadCount);
CountDownLatch start = new CountDownLatch(1);
ExecutorService executor = Executors.newFixedThreadPool(threadCount);
List<Future<?>> futures = new ArrayList<>(threadCount);
try {
for (int thread = 0; thread < threadCount; thread++) {
int threadId = thread;
futures.add(executor.submit(() -> {
ready.countDown();
assertTrue(start.await(10, TimeUnit.SECONDS));
for (int source = 0; source < sourcesPerThread; source++) {
state.putSource(
"org.apache.maven.test",
"shared-artifact",
Sources.buildSource(Path.of("target", "source-" + threadId + '-' + source, "pom.xml")));
}
return null;
}));
}
assertTrue(ready.await(10, TimeUnit.SECONDS));
start.countDown();
for (Future<?> future : futures) {
future.get(30, TimeUnit.SECONDS);
}
} finally {
executor.shutdownNow();
}

int expectedSources = threadCount * sourcesPerThread;
Set<ModelSource> sources =
state.mappedSources.get(new DefaultModelBuilder.GAKey("org.apache.maven.test", "shared-artifact"));
assertTrue(sources.spliterator().hasCharacteristics(Spliterator.CONCURRENT));
assertEquals(expectedSources, sources.size());
assertEquals(
expectedSources,
state.mappedSources
.get(new DefaultModelBuilder.GAKey(null, "shared-artifact"))
.size());
assertThrows(IllegalStateException.class, () -> state.getSource("org.apache.maven.test", "shared-artifact"));
assertThrows(IllegalStateException.class, () -> state.getSource(null, "shared-artifact"));
}

@Test
void testMappedSourcesSuppressesDuplicateSources() {
ModelBuilderRequest request = ModelBuilderRequest.builder()
.session(session)
.requestType(ModelBuilderRequest.RequestType.BUILD_PROJECT)
.source(Sources.buildSource(getPom("simple-standalone")))
.build();
DefaultModelBuilder.ModelBuilderSessionState state =
((DefaultModelBuilder) builder).new ModelBuilderSessionState(request);
ModelSource source = Sources.buildSource(Path.of("target", "duplicate-source", "pom.xml"));

state.putSource("org.apache.maven.test", "duplicate-artifact", source);
state.putSource("org.apache.maven.test", "duplicate-artifact", source);

assertEquals(source, state.getSource("org.apache.maven.test", "duplicate-artifact"));
assertEquals(source, state.getSource(null, "duplicate-artifact"));
}

@Test
public void testMergeRepositories() throws Exception {
// this is here only to trigger mainSession creation; unrelated
Expand Down
Loading