diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 11ec84d6ed..72eb72b6aa 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1010,6 +1010,7 @@ public abstract class AbstractProject

,R extends A public List getSubTasks() { List r = new ArrayList(); + r.add(this); for (SubTaskContributor euc : SubTaskContributor.all()) r.addAll(euc.forProject(this)); for (JobProperty p : properties) diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java index e3abf437fe..09b700c99e 100644 --- a/core/src/main/java/hudson/model/Executor.java +++ b/core/src/main/java/hudson/model/Executor.java @@ -108,6 +108,7 @@ public class Executor extends Thread implements ModelObject { try { synchronized (queue) {// perform this state change as an atomic operation wrt other queue operations workUnit = grabJob(); + workUnit.setExecutor(this); task = workUnit.work; startTime = System.currentTimeMillis(); executable = task.createExecutable(); diff --git a/core/src/main/java/hudson/model/queue/WorkUnit.java b/core/src/main/java/hudson/model/queue/WorkUnit.java index 67a3fa5dfb..c6c15fe109 100644 --- a/core/src/main/java/hudson/model/queue/WorkUnit.java +++ b/core/src/main/java/hudson/model/queue/WorkUnit.java @@ -44,11 +44,27 @@ public final class WorkUnit { */ public final WorkUnitContext context; + private Executor executor; + WorkUnit(WorkUnitContext context, SubTask work) { this.context = context; this.work = work; } + /** + * {@link Executor} running this work unit. + *

+ * {@link Executor#getCurrentWorkUnit()} and {@link WorkUnit#getExecutor()} + * form a bi-directional reachability between them. + */ + public Executor getExecutor() { + return executor; + } + + public void setExecutor(Executor e) { + executor = e; + } + /** * Is this work unit the "main work", which is the primary {@link SubTask} * represented by {@link Task} itself. diff --git a/core/src/main/java/hudson/model/queue/WorkUnitContext.java b/core/src/main/java/hudson/model/queue/WorkUnitContext.java index 78d484dc3e..263d09e3dc 100644 --- a/core/src/main/java/hudson/model/queue/WorkUnitContext.java +++ b/core/src/main/java/hudson/model/queue/WorkUnitContext.java @@ -29,6 +29,8 @@ import hudson.model.Queue; import hudson.model.Queue.BuildableItem; import hudson.model.Queue.Task; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -37,7 +39,6 @@ import java.util.List; * @author Kohsuke Kawaguchi */ public final class WorkUnitContext { - private final int workUnitSize; public final BuildableItem item; @@ -55,6 +56,8 @@ public final class WorkUnitContext { private final Latch startLatch, endLatch; + private List workUnits = new ArrayList(); + public WorkUnitContext(BuildableItem item) { this.item = item; this.task = item.task; @@ -62,7 +65,7 @@ public final class WorkUnitContext { this.actions = item.getActions(); // +1 for the main task - workUnitSize = task.getSubTasks().size(); + int workUnitSize = task.getSubTasks().size(); startLatch = new Latch(workUnitSize) { @Override protected void onCriteriaMet() { @@ -84,7 +87,17 @@ public final class WorkUnitContext { */ public WorkUnit createWorkUnit(SubTask execUnit) { future.addExecutor(Executor.currentExecutor()); - return new WorkUnit(this,execUnit); + WorkUnit wu = new WorkUnit(this, execUnit); + workUnits.add(wu); + return wu; + } + + public List getWorkUnits() { + return Collections.unmodifiableList(workUnits); + } + + public WorkUnit getPrimaryWorkUnit() { + return workUnits.get(0); } /** diff --git a/test/src/test/java/hudson/model/queue/WideExecutionTest.java b/test/src/test/java/hudson/model/queue/WideExecutionTest.java index 9b48231c5a..aff661f10d 100644 --- a/test/src/test/java/hudson/model/queue/WideExecutionTest.java +++ b/test/src/test/java/hudson/model/queue/WideExecutionTest.java @@ -23,10 +23,13 @@ */ package hudson.model.queue; +import hudson.model.AbstractBuild; import hudson.model.AbstractProject; +import hudson.model.Executor; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Queue.Executable; +import hudson.model.Queue.Task; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.TestExtension; @@ -38,10 +41,8 @@ import java.util.Collections; * @author Kohsuke Kawaguchi */ public class WideExecutionTest extends HudsonTestCase { - boolean run = false; - @TestExtension - public class Contributer extends SubTaskContributor { + public static class Contributer extends SubTaskContributor { public Collection forProject(final AbstractProject p) { return Collections.singleton(new AbstractSubTask() { private final AbstractSubTask outer = this; @@ -52,12 +53,21 @@ public class WideExecutionTest extends HudsonTestCase { } public void run() { - run = true; - // no-op + WorkUnitContext wuc = Executor.currentExecutor().getCurrentWorkUnit().context; + AbstractBuild b = (AbstractBuild)wuc.getPrimaryWorkUnit().getExecutor().getCurrentExecutable(); + try { + b.setDescription("I was here"); + } catch (IOException e) { + e.printStackTrace(); + } } }; } + public Task getOwnerTask() { + return p; + } + public String getDisplayName() { return "Company of "+p.getDisplayName(); } @@ -68,6 +78,6 @@ public class WideExecutionTest extends HudsonTestCase { public void testRun() throws Exception { FreeStyleProject p = createFreeStyleProject(); FreeStyleBuild b = assertBuildStatusSuccess(p.scheduleBuild2(0)); - assertTrue(run); + assertTrue(b.getDescription().equals("I was here")); } }