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

PR: MNG-1109 

better handling for timeout and other transfer failed exceptions that are recoverable (ie metadata), and then blacklist the repository for performance.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@306560 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-06 09:40:13 +00:00
parent 6d14b4c4f3
commit 1d42338bb7
7 changed files with 74 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
View File

@ -139,6 +139,11 @@
<!--
<implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation>
-->
<requirements>
<requirement>
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
</requirement>
</requirements>
</component>
<!--

22
maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
View File

@ -19,6 +19,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.wagon.ConnectionException;
@ -72,6 +73,8 @@ public class DefaultWagonManager
private boolean online = true;
private ArtifactRepositoryFactory repositoryFactory;
public Wagon getWagon( String protocol )
throws UnsupportedProtocolException
{
@ -253,7 +256,15 @@ public void getArtifact( Artifact artifact, ArtifactRepository repository )
ArtifactRepositoryPolicy policy = artifact.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
if ( policy.isEnabled() )
if ( !policy.isEnabled() )
{
getLogger().debug( "Skipping disabled repository " + repository.getId() );
}
else if ( repository.isBlacklisted() )
{
getLogger().debug( "Skipping blacklisted repository " + repository.getId() );
}
else
{
getLogger().debug( "Trying repository " + repository.getId() );
getRemoteFile( repository, artifact.getFile(), remotePath, downloadMonitor, policy.getChecksumPolicy() );
@ -261,10 +272,6 @@ public void getArtifact( Artifact artifact, ArtifactRepository repository )
artifact.setResolved( true );
}
else
{
getLogger().debug( "Skipping disabled repository " + repository.getId() );
}
}
public void getArtifactMetadata( ArtifactMetadata metadata, ArtifactRepository repository, File destination,
@ -289,8 +296,9 @@ private void getRemoteFile( ArtifactRepository repository, File destination, Str
ArtifactRepository mirror = getMirror( repository.getId() );
if ( mirror != null )
{
repository = new DefaultArtifactRepository( mirror.getId(), mirror.getUrl(), repository.getLayout(),
repository.getSnapshots(), repository.getReleases() );
repository = repositoryFactory.createArtifactRepository( mirror.getId(), mirror.getUrl(),
repository.getLayout(), repository.getSnapshots(),
repository.getReleases() );
}
String protocol = repository.getProtocol();

12
maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
View File

@ -40,6 +40,8 @@ public class DefaultArtifactRepository
private boolean uniqueVersion;
private boolean blacklisted;
/**
* Create a local repository or a test repository.
*
@ -139,4 +141,14 @@ public boolean isUniqueVersion()
{
return uniqueVersion;
}
public boolean isBlacklisted()
{
return blacklisted;
}
public void setBlacklisted( boolean blacklisted )
{
this.blacklisted = blacklisted;
}
}

25
maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
View File

@ -18,6 +18,9 @@
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import java.util.HashMap;
import java.util.Map;
/**
* @author jdcasey
*/
@ -29,8 +32,11 @@ public class DefaultArtifactRepositoryFactory
private String globalChecksumPolicy;
private final Map artifactRepositories = new HashMap();
public ArtifactRepository createDeploymentArtifactRepository( String id, String url,
ArtifactRepositoryLayout repositoryLayout, boolean uniqueVersion )
ArtifactRepositoryLayout repositoryLayout,
boolean uniqueVersion )
{
return new DefaultArtifactRepository( id, url, repositoryLayout, uniqueVersion );
}
@ -40,6 +46,16 @@ public ArtifactRepository createArtifactRepository( String id, String url,
ArtifactRepositoryPolicy snapshots,
ArtifactRepositoryPolicy releases )
{
if ( artifactRepositories.containsKey( id ) )
{
ArtifactRepository repository = (ArtifactRepository) artifactRepositories.get( id );
// TODO: this should be an if there are duplicates?
if ( repository.getUrl().equals( url ) )
{
return repository;
}
}
if ( snapshots == null )
{
snapshots = new ArtifactRepositoryPolicy();
@ -62,7 +78,12 @@ public ArtifactRepository createArtifactRepository( String id, String url,
releases.setChecksumPolicy( globalChecksumPolicy );
}
return new DefaultArtifactRepository( id, url, repositoryLayout, snapshots, releases );
DefaultArtifactRepository repository = new DefaultArtifactRepository( id, url, repositoryLayout, snapshots,
releases );
artifactRepositories.put( id, repository );
return repository;
}
public void setGlobalUpdatePolicy( String updatePolicy )

13
maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
View File

@ -70,6 +70,10 @@ public void resolve( RepositoryMetadata metadata, List remoteRepositories, Artif
{
getLogger().debug( "Skipping disabled repository " + repository.getId() );
}
else if ( repository.isBlacklisted() )
{
getLogger().debug( "Skipping blacklisted repository " + repository.getId() );
}
else
{
File file = new File( localRepository.getBasedir(),
@ -111,7 +115,7 @@ public void resolve( RepositoryMetadata metadata, List remoteRepositories, Artif
ArtifactRepositoryPolicy policy = metadata.isSnapshot() ? repository.getSnapshots()
: repository.getReleases();
if ( policy.isEnabled() )
if ( policy.isEnabled() && !repository.isBlacklisted() )
{
if ( loadMetadata( metadata, repository, localRepository, previousMetadata ) )
{
@ -260,7 +264,6 @@ public void resolveAlways( RepositoryMetadata metadata, ArtifactRepository local
private void resolveAlways( ArtifactMetadata metadata, ArtifactRepository repository, File file,
String checksumPolicy )
throws ArtifactMetadataRetrievalException
{
if ( !wagonManager.isOnline() )
{
@ -284,7 +287,11 @@ private void resolveAlways( ArtifactMetadata metadata, ArtifactRepository reposi
}
catch ( TransferFailedException e )
{
throw new ArtifactMetadataRetrievalException( "Unable to retrieve metadata", e );
getLogger().warn( metadata + " could not be found on repository: " + repository.getId() +
" due to an error: " + e.getCause().getMessage() );
getLogger().info( "Repository '" + repository.getId() + "' will be blacklisted" );
getLogger().debug( "Exception", e );
repository.setBlacklisted( true );
}
}

5
maven-artifact-manager/src/main/resources/META-INF/plexus/components.xml
View File

@ -8,6 +8,11 @@
<component>
<role>org.apache.maven.artifact.manager.WagonManager</role>
<implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation>
<requirements>
<requirement>
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
</requirement>
</requirements>
</component>
<component>

4
maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
View File

@ -51,4 +51,8 @@ public interface ArtifactRepository
String getKey();
boolean isUniqueVersion();
void setBlacklisted( boolean blackListed );
boolean isBlacklisted();
}