-
Notifications
You must be signed in to change notification settings - Fork 2.9k
[MNG-7156] Parallel build can cause issues between clean and forked g… #476
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.
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
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0024f62
[MNG-7156] Parallel build can cause issues between clean and forked g…
gnodet eefdf8d
[MNG-7156] Parallel build can cause issues between clean and forked g…
gnodet 654b40c
[MNG-7156] Fixes after review
gnodet f7b04e9
Tone down logging to debug when pausing concurrent execution
gnodet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
98 changes: 98 additions & 0 deletions
98
maven-core/src/main/java/org/apache/maven/execution/LockingEventSpy.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| package org.apache.maven.execution; | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.concurrent.locks.Lock; | ||
| import java.util.concurrent.locks.ReentrantLock; | ||
|
|
||
| import javax.inject.Named; | ||
| import javax.inject.Singleton; | ||
|
|
||
| import org.apache.maven.eventspy.AbstractEventSpy; | ||
| import org.apache.maven.eventspy.EventSpy; | ||
| import org.apache.maven.project.MavenProject; | ||
| import org.eclipse.aether.SessionData; | ||
| import org.eclipse.sisu.Typed; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * EventSpy implementation that provides a per-project locking mechanism | ||
| * to make sure a given project can not be built concurrently. | ||
| * This case can happen when running parallel builds with forked lifecycles. | ||
| */ | ||
| @Singleton | ||
| @Named | ||
| @Typed( EventSpy.class ) | ||
| public class LockingEventSpy extends AbstractEventSpy | ||
| { | ||
|
|
||
| private static final Object LOCKS_KEY = new Object(); | ||
|
|
||
| private final Logger logger = LoggerFactory.getLogger( getClass() ); | ||
|
|
||
| @Override | ||
| public void onEvent( Object event ) throws Exception | ||
| { | ||
| if ( event instanceof ExecutionEvent ) | ||
| { | ||
| ExecutionEvent executionEvent = ( ExecutionEvent ) event; | ||
| switch ( executionEvent.getType() ) | ||
| { | ||
| case ProjectStarted: | ||
| case ForkedProjectStarted: | ||
| Lock lock = getLock( executionEvent ); | ||
| if ( !lock.tryLock() ) | ||
| { | ||
| logger.debug( "Suspending concurrent execution of project '{}'", executionEvent.getProject() ); | ||
| lock.lockInterruptibly(); | ||
| logger.debug( "Resuming execution of project '{}'", executionEvent.getProject() ); | ||
| } | ||
| break; | ||
| case ProjectSucceeded: | ||
| case ProjectFailed: | ||
|
MartinKanters marked this conversation as resolved.
|
||
| case ForkedProjectSucceeded: | ||
| case ForkedProjectFailed: | ||
| getLock( executionEvent ).unlock(); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @SuppressWarnings( { "unchecked", "rawtypes" } ) | ||
| private Lock getLock( ExecutionEvent event ) | ||
| { | ||
| SessionData data = event.getSession().getRepositorySession().getData(); | ||
| Map<MavenProject, Lock> locks = ( Map ) data.get( LOCKS_KEY ); | ||
| // initialize the value if not already done (in case of a concurrent access) to the method | ||
| if ( locks == null ) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would it make sense to use |
||
| { | ||
| // the call to data.set(k, null, v) is effectively a call to data.putIfAbsent(k, v) | ||
| data.set( LOCKS_KEY, null, new ConcurrentHashMap<>() ); | ||
| locks = ( Map ) data.get( LOCKS_KEY ); | ||
| } | ||
| return locks.computeIfAbsent( event.getProject(), p -> new ReentrantLock() ); | ||
| } | ||
|
|
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.