[JENKINS-8790] revisited the fix to take advantage of the atomicity between...

[JENKINS-8790] revisited the fix to take advantage of the atomicity between Queue.pop() and executor state change

core/src/main/java/hudson/model/OneOffExecutor.java

@@ -48,9 +48,14 @@ public class OneOffExecutor extends Executor {
         return super.shouldRun() && work !=null;
     }
 
+    public WorkUnit getAssignedWorkUnit() {
+        return work;
+    }
+
     @Override
     protected WorkUnit grabJob() throws InterruptedException {
-        WorkUnit r = work;
+        WorkUnit r = super.grabJob();
+        assert r==work;
         work = null;
         return r;
     }

core/src/main/java/hudson/model/Queue.java

@@ -756,6 +756,13 @@ public class Queue extends ResourceController implements Saveable {
     public synchronized WorkUnit pop() throws InterruptedException {
         final Executor exec = Executor.currentExecutor();
 
+        if (exec instanceof OneOffExecutor) {
+            OneOffExecutor ooe = (OneOffExecutor) exec;
+            final WorkUnit wu = ooe.getAssignedWorkUnit();
+            pendings.remove(wu.context.item);
+            return wu;
+        }
+
         try {
             while (true) {
                 final JobOffer offer = new JobOffer(exec);
@@ -959,6 +966,7 @@ public class Queue extends ResourceController implements Saveable {
                 if (c==null || c.isOffline())    continue;
                 if (lbl!=null && !lbl.contains(n))  continue;
                 c.startFlyWeightTask(new WorkUnitContext(p).createWorkUnit(p.task));
+                pendings.add(p);
                 return;
             }
             // if the execution get here, it means we couldn't schedule it anywhere.

test/src/test/java/hudson/model/QueueTest.java

@@ -26,18 +26,28 @@ package hudson.model;
 import com.gargoylesoftware.htmlunit.html.HtmlFileInput;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import hudson.matrix.AxisList;
+import hudson.matrix.MatrixBuild;
+import hudson.matrix.MatrixProject;
+import hudson.matrix.MatrixRun;
+import hudson.matrix.TextAxis;
 import hudson.model.Cause.*;
+import hudson.tasks.Shell;
 import hudson.triggers.SCMTrigger.SCMTriggerCause;
 import hudson.triggers.TimerTrigger.TimerTriggerCause;
 import hudson.util.XStream2;
 import hudson.util.OneShotEvent;
 import hudson.Launcher;
+import net.sf.json.JSONObject;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.FileUtils;
+import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.HudsonTestCase;
+import org.jvnet.hudson.test.SleepBuilder;
 import org.jvnet.hudson.test.TestBuilder;
+import org.kohsuke.stapler.StaplerRequest;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.bio.SocketConnector;
 import org.mortbay.jetty.servlet.ServletHandler;
@@ -49,6 +59,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Future;
 
@@ -227,4 +238,22 @@ public class QueueTest extends HudsonTestCase {
                         + "Started by remote host 4.3.2.1 with note: test "
                         + "Started by remote host 1.2.3.4 with note: foo"));
     }
+
+    @Bug(8790)
+    public void testFlyweightTasks() throws Exception {
+        MatrixProject m = createMatrixProject();
+        m.addProperty(new ParametersDefinitionProperty(
+                new StringParameterDefinition("FOO","value")
+        ));
+        m.getBuildersList().add(new Shell("sleep 3"));
+        m.setAxes(new AxisList(new TextAxis("DoesntMatter", "aaa","bbb")));
+
+        List<Future<MatrixBuild>> r = new ArrayList<Future<MatrixBuild>>();
+
+        for (int i=0; i<3; i++)
+            r.add(m.scheduleBuild2(0,new LegacyCodeCause(),new ParametersAction(new StringParameterValue("FOO","value"+i))));
+
+        for (Future<MatrixBuild> f : r)
+            assertBuildStatusSuccess(f);
+    }
 }