From 35dfc75c682e1c7dbc1308426e1d75a0f18a2ab9 Mon Sep 17 00:00:00 2001 From: ikedam Date: Sat, 15 Mar 2014 09:40:31 +0900 Subject: [PATCH 1/3] [JENKINS-21932] Added tests to reproduce JENKINS-21932, Future#get does not abort even when a task in the queue is canceled. --- .../src/test/java/hudson/model/QueueTest.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java index ad184c374f..ab62b06f94 100644 --- a/test/src/test/java/hudson/model/QueueTest.java +++ b/test/src/test/java/hudson/model/QueueTest.java @@ -58,6 +58,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -556,4 +557,31 @@ public class QueueTest extends HudsonTestCase { assertFalse("Project " + project2.getDisplayName() + " stuck in pendings",item.task.getName().equals(project2.getName())); } } + + public void testCancelInQueue() throws Exception + { + DumbSlave slave = createSlave(); + assertTrue(slave.toComputer().isOffline()); + + FreeStyleProject p = createFreeStyleProject(); + p.setAssignedNode(slave); + + QueueTaskFuture f = p.scheduleBuild2(0); + try { + f.get(3, TimeUnit.SECONDS); + fail("Should time out (as the slave is offline)."); + } catch (TimeoutException e) { + } + + Queue.Item item = Queue.getInstance().getItem(p); + assertNotNull(item); + Queue.getInstance().doCancelItem(item.id); + assertNull(Queue.getInstance().getItem(p)); + + try { + f.get(10, TimeUnit.SECONDS); + fail("Should not get (as it is cancelled)."); + } catch (CancellationException e) { + } + } } From 5c3672270bcc97d5d05541f284c35b44067693ea Mon Sep 17 00:00:00 2001 From: ikedam Date: Sat, 15 Mar 2014 14:30:24 +0900 Subject: [PATCH 2/3] [JENKINS-21932] Make the slave used in the test offline explicitly. --- test/src/test/java/hudson/model/QueueTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java index ab62b06f94..94378f7023 100644 --- a/test/src/test/java/hudson/model/QueueTest.java +++ b/test/src/test/java/hudson/model/QueueTest.java @@ -560,7 +560,10 @@ public class QueueTest extends HudsonTestCase { public void testCancelInQueue() throws Exception { - DumbSlave slave = createSlave(); + // parepare an offline slave. + DumbSlave slave = createOnlineSlave(); + assertFalse(slave.toComputer().isOffline()); + slave.toComputer().disconnect(null).get(); assertTrue(slave.toComputer().isOffline()); FreeStyleProject p = createFreeStyleProject(); From 0c3d67097a3394fee7f0eb895c4350ea96887a02 Mon Sep 17 00:00:00 2001 From: ikedam Date: Sat, 15 Mar 2014 16:08:07 +0900 Subject: [PATCH 3/3] [FIXED JENKINS-21932] Call Item#cancel when a task in a queue is cancelled. --- core/src/main/java/hudson/model/Queue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index c14bbe316c..e1934c367f 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -646,7 +646,7 @@ public class Queue extends ResourceController implements Saveable { public synchronized boolean cancel(Item item) { LOGGER.log(Level.FINE, "Cancelling {0} item#{1}", new Object[] {item.task, item.id}); - boolean r = item.leave(this); + boolean r = item.cancel(this); LeftItem li = new LeftItem(item); li.enter(this);