You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/01/17 21:24:45 UTC
[maven] branch maven-3.8.x updated: [MNG-7381] Shorten parallel builder thread name to artifactId, conditionally with groupId
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.8.x by this push:
new 67ff805 [MNG-7381] Shorten parallel builder thread name to artifactId, conditionally with groupId
67ff805 is described below
commit 67ff80544866aa9256624d34a6e4178c3b913996
Author: Falko Modler <fa...@users.noreply.github.com>
AuthorDate: Mon Jan 17 22:07:09 2022 +0100
[MNG-7381] Shorten parallel builder thread name to artifactId, conditionally with groupId
This closes #663
---
.../multithreaded/MultiThreadedBuilder.java | 38 +++++++++++++++++++---
1 file changed, 33 insertions(+), 5 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index 2688a6b..1be0e42 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -19,8 +19,10 @@ package org.apache.maven.lifecycle.internal.builder.multithreaded;
* under the License.
*/
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletionService;
import java.util.concurrent.ExecutionException;
@@ -127,13 +129,17 @@ public class MultiThreadedBuilder
ThreadOutputMuxer muxer )
{
+ // gather artifactIds which are not unique so that the respective thread names can be extended with the groupId
+ Set<String> duplicateArtifactIds = gatherDuplicateArtifactIds( projectBuildList.keySet() );
+
// schedule independent projects
for ( MavenProject mavenProject : analyzer.getRootSchedulableBuilds() )
{
ProjectSegment projectSegment = projectBuildList.get( mavenProject );
logger.debug( "Scheduling: " + projectSegment.getProject() );
Callable<ProjectSegment> cb =
- createBuildCallable( rootSession, projectSegment, reactorContext, taskSegment, muxer );
+ createBuildCallable( rootSession, projectSegment, reactorContext, taskSegment, muxer,
+ duplicateArtifactIds );
service.submit( cb );
}
@@ -158,7 +164,8 @@ public class MultiThreadedBuilder
ProjectSegment scheduledDependent = projectBuildList.get( mavenProject );
logger.debug( "Scheduling: " + scheduledDependent );
Callable<ProjectSegment> cb =
- createBuildCallable( rootSession, scheduledDependent, reactorContext, taskSegment, muxer );
+ createBuildCallable( rootSession, scheduledDependent, reactorContext, taskSegment, muxer,
+ duplicateArtifactIds );
service.submit( cb );
}
}
@@ -180,7 +187,9 @@ public class MultiThreadedBuilder
private Callable<ProjectSegment> createBuildCallable( final MavenSession rootSession,
final ProjectSegment projectBuild,
final ReactorContext reactorContext,
- final TaskSegment taskSegment, final ThreadOutputMuxer muxer )
+ final TaskSegment taskSegment,
+ final ThreadOutputMuxer muxer,
+ final Set<String> duplicateArtifactIds )
{
return new Callable<ProjectSegment>()
{
@@ -188,13 +197,18 @@ public class MultiThreadedBuilder
{
final Thread currentThread = Thread.currentThread();
final String originalThreadName = currentThread.getName();
- currentThread.setName( "mvn-builder-" + projectBuild.getProject().getId() );
+ final MavenProject project = projectBuild.getProject();
+
+ final String threadNameSuffix = duplicateArtifactIds.contains( project.getArtifactId() )
+ ? project.getGroupId() + ":" + project.getArtifactId()
+ : project.getArtifactId();
+ currentThread.setName( "mvn-builder-" + threadNameSuffix );
try
{
// muxer.associateThreadWithProjectSegment( projectBuild );
lifecycleModuleBuilder.buildProject( projectBuild.getSession(), rootSession, reactorContext,
- projectBuild.getProject(), taskSegment );
+ project, taskSegment );
// muxer.setThisModuleComplete( projectBuild );
return projectBuild;
@@ -206,4 +220,18 @@ public class MultiThreadedBuilder
}
};
}
+
+ private Set<String> gatherDuplicateArtifactIds( Set<MavenProject> projects )
+ {
+ Set<String> artifactIds = new HashSet<>( projects.size() );
+ Set<String> duplicateArtifactIds = new HashSet<>();
+ for ( MavenProject project : projects )
+ {
+ if ( !artifactIds.add( project.getArtifactId() ) )
+ {
+ duplicateArtifactIds.add( project.getArtifactId() );
+ }
+ }
+ return duplicateArtifactIds;
+ }
}