From d1d524863cbb2f1f443fc4bf7c25933b7a31b85d Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 29 Jul 2013 16:06:18 -0400 Subject: [PATCH] [FIXED JENKINS-18895] MavenModuleSetBuild.getResult is expensive. --- changelog.html | 3 +++ .../java/hudson/maven/MavenModuleSetBuild.java | 14 ++++++++++++-- .../java/org/jvnet/hudson/test/RunLoadCounter.java | 12 ++++++++++-- .../hudson/maven/MavenBuildSurefireFailedTest.java | 13 ++++++++++++- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/changelog.html b/changelog.html index 190d2d58eb..ab971e8823 100644 --- a/changelog.html +++ b/changelog.html @@ -61,6 +61,9 @@ Upcoming changes
  • Maven build failure wasn't describing errors like Maven CLI does. (issue 15025) +
  • + MavenModuleSetBuild.getResult is expensive. + (issue 18895)
  • Revisited fix to be compatible for plugins. (issue 18119) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 4e369efbe1..93ed9929b3 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -53,7 +53,6 @@ import hudson.model.Result; import hudson.model.Run; import hudson.model.StringParameterDefinition; import hudson.model.TaskListener; -import hudson.remoting.Callable; import hudson.remoting.VirtualChannel; import hudson.scm.ChangeLogSet; import hudson.tasks.BuildStep; @@ -93,7 +92,6 @@ import jenkins.mvn.SettingsProvider; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.artifact.versioning.ComparableVersion; -import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingException; import org.codehaus.plexus.util.PathTool; @@ -136,6 +134,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild actions = getActions(); diff --git a/test/src/main/java/org/jvnet/hudson/test/RunLoadCounter.java b/test/src/main/java/org/jvnet/hudson/test/RunLoadCounter.java index 84a0d18b3d..43ef1f7379 100644 --- a/test/src/main/java/org/jvnet/hudson/test/RunLoadCounter.java +++ b/test/src/main/java/org/jvnet/hudson/test/RunLoadCounter.java @@ -50,12 +50,16 @@ public final class RunLoadCounter { /** * Prepares a new project to be measured. - * Call this before starting builds. + * Usually called before starting builds, but may also be called retroactively. * @param project a project of any kind * @throws IOException if preparations fail */ public static void prepare(AbstractProject project) throws IOException { project.getPublishersList().add(new MarkerAdder()); + for (AbstractBuild build : project._getRuns()) { + Marker.add(build); + build.save(); + } } /** @@ -97,6 +101,10 @@ public final class RunLoadCounter { @Restricted(NoExternalUse.class) public static final class Marker implements RunAction { + static void add(AbstractBuild build) { + build.addAction(new Marker(build.getParent().getFullName(), build.getNumber())); + } + private final String project; private final int build; @@ -137,7 +145,7 @@ public final class RunLoadCounter { public static final class MarkerAdder extends Notifier { @Override public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - build.addAction(new Marker(build.getParent().getFullName(), build.getNumber())); + Marker.add(build); return true; } diff --git a/test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java b/test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java index 70be3e2918..1bcece674b 100755 --- a/test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java +++ b/test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java @@ -2,10 +2,12 @@ package hudson.maven; import hudson.model.Result; import hudson.tasks.Shell; +import java.util.concurrent.Callable; import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.ExtractResourceSCM; import org.jvnet.hudson.test.HudsonTestCase; +import org.jvnet.hudson.test.RunLoadCounter; /** * @author Olivier Lamy @@ -24,10 +26,19 @@ public class MavenBuildSurefireFailedTest extends HudsonTestCase { @Bug(8415) public void testMaven2Failed() throws Exception { configureDefaultMaven(); - MavenModuleSet m = createMavenProject(); + final MavenModuleSet m = createMavenProject(); m.setGoals( "test -Dmaven.test.failure.ignore=false" ); m.setScm(new ExtractResourceSCM(getClass().getResource("maven-multimodule-unit-failure.zip"))); assertBuildStatus(Result.FAILURE, m.scheduleBuild2(0).get()); + // JENKINS-18895: + MavenModule failing = m.getModule("com.mycompany.app:my-app"); + assertEquals(Result.FAILURE, failing.getLastBuild().getResult()); + RunLoadCounter.prepare(failing); + assertEquals(Result.FAILURE, RunLoadCounter.assertMaxLoads(failing, 0, new Callable() { + @Override public Result call() throws Exception { + return m.getLastBuild().getResult(); + } + })); } @Bug(8415)