-
Notifications
You must be signed in to change notification settings - Fork 189
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve errors handling while downloading p2 artifacts from repository
In case an artifact couldn't be downloaded due to e.g. a bad mirror, p2 returns an RETRY error code. This code is currently ignored and Tycho simply fails with an I/O exception. Instead, Tycho attempts to download the artifact up to three times (assuming that this error code was returned), before failing. This value can be configured using the 'eclipse.p2.maxDownloadAttempts' system property. (cherry picked from commit 8462a37)
- Loading branch information
Showing
12 changed files
with
339 additions
and
9 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
20 changes: 20 additions & 0 deletions
20
tycho-its/projects/p2Repository.mirror/baseline/artifacts.xml
This file contains 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,20 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <?artifactRepository version='1.1.0'?> | ||
| <repository name='baseline - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'> | ||
| <properties size='2'> | ||
| <property name='p2.timestamp' value='1643973510842'/> | ||
| <property name='p2.compressed' value='false'/> | ||
| <property name ='p2.mirrorsURL' value='set by test' /> | ||
| </properties> | ||
| <mappings size='1'> | ||
| <rule filter='(& (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/> | ||
| </mappings> | ||
| <artifacts size='1'> | ||
| <artifact classifier='osgi.bundle' id='bundle1' version='1.0.0'> | ||
| <properties size='2'> | ||
| <property name='artifact.size' value='417'/> | ||
| <property name='download.size' value='417'/> | ||
| </properties> | ||
| </artifact> | ||
| </artifacts> | ||
| </repository> |
34 changes: 34 additions & 0 deletions
34
tycho-its/projects/p2Repository.mirror/baseline/content.xml
This file contains 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,34 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <?metadataRepository version='1.2.0'?> | ||
| <repository name='baseline - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'> | ||
| <properties size='2'> | ||
| <property name='p2.timestamp' value='1643973510843'/> | ||
| <property name='p2.compressed' value='false'/> | ||
| </properties> | ||
| <units size='1'> | ||
| <unit id='bundle1' version='1.0.0' singleton='false'> | ||
| <update id='bundle1' range='[0.0.0,1.0.0)' severity='0'/> | ||
| <provides size='4'> | ||
| <provided namespace='org.eclipse.equinox.p2.iu' name='bundle1' version='1.0.0'/> | ||
| <provided namespace='osgi.bundle' name='bundle1' version='1.0.0'/> | ||
| <provided namespace='osgi.identity' name='bundle1' version='1.0.0'> | ||
| <properties size='1'> | ||
| <property name='type' value='osgi.bundle'/> | ||
| </properties> | ||
| </provided> | ||
| <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/> | ||
| </provides> | ||
| <artifacts size='1'> | ||
| <artifact classifier='osgi.bundle' id='bundle1' version='1.0.0'/> | ||
| </artifacts> | ||
| <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/> | ||
| <touchpointData size='1'> | ||
| <instructions size='1'> | ||
| <instruction key='manifest'> | ||
| Bundle-SymbolicName: bundle1
Bundle-Version: 1.0.0
 | ||
| </instruction> | ||
| </instructions> | ||
| </touchpointData> | ||
| </unit> | ||
| </units> | ||
| </repository> |
This file contains 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,4 @@ | ||
| <mirrors> | ||
| <mirror url ='set by test'/> | ||
| <mirror url ='set by test'/> | ||
| </mirrors> |
Binary file added
BIN
+417 Bytes
tycho-its/projects/p2Repository.mirror/baseline/plugins/bundle1_1.0.0.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions
6
tycho-its/projects/p2Repository.mirror/bundle/META-INF/MANIFEST.MF
This file contains 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,6 @@ | ||
| Manifest-Version: 1.0 | ||
| Bundle-ManifestVersion: 2 | ||
| Bundle-SymbolicName: bundle1 | ||
| Bundle-Version: 1.0.0 | ||
| Automatic-Module-Name: bundle1 | ||
|
|
This file contains 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 @@ | ||
| bin.includes = META-INF/ |
This file contains 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,45 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>p2Repository.mirror</groupId> | ||
| <artifactId>parent</artifactId> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <packaging>eclipse-plugin</packaging> | ||
| <artifactId>bundle1</artifactId> | ||
| <version>1.0.0</version> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho</groupId> | ||
| <artifactId>tycho-baseline-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>compare-version-with-baseline</id> | ||
| <phase>verify</phase> | ||
| <goals> | ||
| <goal>verify</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <ignores> | ||
| <ignore>META-INF/maven/**/*</ignore> | ||
| </ignores> | ||
| <baselines> | ||
| <repository> | ||
| <id>repo</id> | ||
| <url>${baseline}</url> | ||
| <layout>p2</layout> | ||
| </repository> | ||
| </baselines> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
This file contains 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,23 @@ | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <groupId>p2Repository.mirror</groupId> | ||
| <artifactId>parent</artifactId> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <modules> | ||
| <module>bundle</module> | ||
| </modules> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho</groupId> | ||
| <artifactId>tycho-maven-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <extensions>true</extensions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
160 changes: 160 additions & 0 deletions
160
tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryMirrorTest.java
This file contains 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,160 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 Patrick Ziegler and others. | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Patrick Ziegler - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.tycho.test.p2Repository; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileWriter; | ||
|
|
||
| import javax.xml.parsers.DocumentBuilder; | ||
| import javax.xml.parsers.DocumentBuilderFactory; | ||
| import javax.xml.transform.Transformer; | ||
| import javax.xml.transform.TransformerFactory; | ||
| import javax.xml.transform.dom.DOMSource; | ||
| import javax.xml.transform.stream.StreamResult; | ||
| import javax.xml.xpath.XPath; | ||
| import javax.xml.xpath.XPathConstants; | ||
| import javax.xml.xpath.XPathFactory; | ||
|
|
||
| import org.apache.maven.it.Verifier; | ||
| import org.eclipse.jetty.servlet.DefaultServlet; | ||
| import org.eclipse.jetty.util.resource.EmptyResource; | ||
| import org.eclipse.jetty.util.resource.Resource; | ||
| import org.eclipse.tycho.test.AbstractTychoIntegrationTest; | ||
| import org.eclipse.tycho.test.util.HttpServer; | ||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.w3c.dom.Document; | ||
| import org.w3c.dom.Element; | ||
| import org.w3c.dom.NodeList; | ||
|
|
||
| public class P2RepositoryMirrorTest extends AbstractTychoIntegrationTest { | ||
|
|
||
| private HttpServer server; | ||
|
|
||
| @Before | ||
| public void startServer() throws Exception { | ||
| server = HttpServer.startServer(); | ||
| } | ||
|
|
||
| @After | ||
| public void stopServer() throws Exception { | ||
| server.stop(); | ||
| } | ||
|
|
||
| /** | ||
| * Tests whether Tycho is able to recover from a bad mirror repository. If | ||
| * multiple mirrors are specified for a repository, Tycho might be able to | ||
| * continue by requesting an artifact from a different mirror, depending on the | ||
| * error code returned by Equinox. | ||
| */ | ||
| @Test | ||
| public void testMirrorWithRetry() throws Exception { | ||
| Verifier verifier = getVerifier("p2Repository.mirror", false); | ||
|
|
||
| String baseline = server.addServer("baseline", FirstBaselineRequestFailsServlet.class, | ||
| new File(verifier.getBasedir(), "baseline")); | ||
| // Two mirrors, to always have at least one that is still good | ||
| String mirror1 = server.addServer("mirror1", FirstBaselineRequestFailsServlet.class, | ||
| new File(verifier.getBasedir(), "baseline")); | ||
| String mirror2 = server.addServer("mirror2", FirstBaselineRequestFailsServlet.class, | ||
| new File(verifier.getBasedir(), "baseline")); | ||
| String mirrors = baseline + '/' + "mirrors.xml"; | ||
|
|
||
| setMirrorsUrl(new File(verifier.getBasedir(), "baseline/artifacts.xml"), mirrors); | ||
| setMirrors(new File(verifier.getBasedir(), "baseline/mirrors.xml"), mirror1, mirror2); | ||
|
|
||
| // The verifier escapes the 'http://localhost' to 'http:/localhost' | ||
| verifier.addCliOption("-Dbaseline=" + baseline.replaceAll("//", "////")); | ||
| // Force an update of the HttpCache | ||
| verifier.addCliOption("-U"); | ||
| verifier.executeGoal("verify"); | ||
| verifier.verifyErrorFreeLog(); | ||
| verifier.verifyTextInLog("Artifact repository requested retry (attempt [1/3]):"); | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean isDisableMirrors() { | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * Updates the "p2.mirrorsURL" property in the {@code artifacts.xml} file of the | ||
| * baseline repository to point to the {@code mirrors.xml} file. | ||
| */ | ||
| private static void setMirrorsUrl(File artifactsXml, String mirrorsUrl) throws Exception { | ||
| Document document = parseDocument(artifactsXml); | ||
|
|
||
| XPath path = XPathFactory.newInstance().newXPath(); | ||
| String expression = "repository/properties/property[@name='p2.mirrorsURL']"; | ||
| Element node = (Element) path.evaluate(expression, document, XPathConstants.NODE); | ||
|
|
||
| if (node != null) { | ||
| node.setAttribute("value", mirrorsUrl); | ||
| writeDocument(document, artifactsXml); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Updates the {@link mirrors.xml} file to contain the bad mirror. | ||
| */ | ||
| private static void setMirrors(File mirrorsXml, String mirror1, String mirror2) throws Exception { | ||
| Document document = parseDocument(mirrorsXml); | ||
|
|
||
| XPath path = XPathFactory.newInstance().newXPath(); | ||
| String expression = "mirrors/mirror"; | ||
| NodeList nodes = (NodeList) path.evaluate(expression, document, XPathConstants.NODESET); | ||
|
|
||
| if (nodes != null) { | ||
| ((Element) nodes.item(0)).setAttribute("url", mirror1); | ||
| ((Element) nodes.item(1)).setAttribute("url", mirror2); | ||
| writeDocument(document, mirrorsXml); | ||
| } | ||
| } | ||
|
|
||
| public static Document parseDocument(File file) throws Exception { | ||
| DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); | ||
| DocumentBuilder builder = factory.newDocumentBuilder(); | ||
| return builder.parse(file); | ||
| } | ||
|
|
||
| public static void writeDocument(Document document, File file) throws Exception { | ||
| TransformerFactory transformerFactory = TransformerFactory.newInstance(); | ||
| Transformer transformer = transformerFactory.newTransformer(); | ||
|
|
||
| try (FileWriter writer = new FileWriter(file)) { | ||
| DOMSource source = new DOMSource(document); | ||
| StreamResult result = new StreamResult(writer); | ||
| transformer.transform(source, result); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Helper servlet to simulate an illegal p2 repository. The first time a plugin | ||
| * is requested from the remote repository, a 404 is returned. Any further | ||
| * requests succeed, to test whether Tycho is able to recover from bad mirrors. | ||
| */ | ||
| public static class FirstBaselineRequestFailsServlet extends DefaultServlet { | ||
| // We don't know which mirror is selected, so anyone can fail | ||
| private static boolean firstRequest = true; | ||
|
|
||
| @Override | ||
| public Resource getResource(String pathInContext) { | ||
| if (firstRequest && pathInContext.startsWith("/plugins/")) { | ||
| firstRequest = false; | ||
| return EmptyResource.INSTANCE; | ||
| } | ||
| return super.getResource(pathInContext); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.