Skip to content

[MNG-6720] - Wait for parallel projects when using --fail-fast #272

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

Closed
oehme wants to merge 1 commit into from
Closed

[MNG-6720] - Wait for parallel projects when using --fail-fast #272

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
20 changes: 4 additions & 16 deletions .../java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;

import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.BuildThreadFactory;
Expand Down Expand Up @@ -114,6 +114,9 @@ public void build( MavenSession session, ReactorContext reactorContext, ProjectB
}

}

executor.shutdown();
executor.awaitTermination( Long.MAX_VALUE, TimeUnit.MILLISECONDS );
}

private void multiThreadedProjectTaskSegmentBuild( ConcurrencyDependencyGraph analyzer,
Expand Down Expand Up @@ -172,21 +175,6 @@ private void multiThreadedProjectTaskSegmentBuild( ConcurrencyDependencyGraph an
break;
}
}

// cancel outstanding builds (if any) - this can happen if an exception is thrown in above block

Future<ProjectSegment> unprocessed;
while ( ( unprocessed = service.poll() ) != null )
{
try
{
unprocessed.get();
}
catch ( InterruptedException | ExecutionException e )
{
throw new RuntimeException( e );
}
}
}

private Callable<ProjectSegment> createBuildCallable( final MavenSession rootSession,
Expand Down