From 7f5dc7ae4529eed56d4f5831bbe70d339108aef2 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sun, 30 Mar 2008 15:17:20 +0000
Subject: [PATCH] If all executors are busy, the queue status is not getting
 updated.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@8113 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/model/Queue.java | 39 ++++++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index 9639c102c7..832758724e 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -1,12 +1,15 @@
 package hudson.model;
 
 import hudson.Util;
-import org.kohsuke.stapler.export.ExportedBean;
-import org.kohsuke.stapler.export.Exported;
-import org.acegisecurity.AccessDeniedException;
 import hudson.model.Node.Mode;
+import hudson.triggers.SafeTimerTask;
+import hudson.triggers.Trigger;
 import hudson.util.OneShotEvent;
+import org.acegisecurity.AccessDeniedException;
+import org.kohsuke.stapler.export.Exported;
+import org.kohsuke.stapler.export.ExportedBean;
 
+import javax.management.timer.Timer;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -14,6 +17,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.lang.ref.WeakReference;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -108,6 +112,12 @@ public class Queue extends ResourceController {
 
     private final Map<Executor,JobOffer> parked = new HashMap<Executor,JobOffer>();
 
+    public Queue() {
+        // if all the executors are busy doing something, then the queue won't be maintained in
+        // timely fashion, so use another thread to make sure it happens.
+        new MaintainTask(this);
+    }
+
     /**
      * Loads the queue contents that was {@link #save() saved}.
      */
@@ -725,4 +735,27 @@ public class Queue extends ResourceController {
     private int iota=0;
 
     private static final Logger LOGGER = Logger.getLogger(Queue.class.getName());
+
+    /**
+     * Regularly invokes {@link Queue#maintain()} and clean itself up when
+     * {@link Queue} gets GC-ed.
+     */
+    private static class MaintainTask extends SafeTimerTask {
+        private final WeakReference<Queue> queue;
+
+        MaintainTask(Queue queue) {
+            this.queue = new WeakReference<Queue>(queue);
+
+            long interval = 5 * Timer.ONE_SECOND;
+            Trigger.timer.schedule(this, interval, interval);
+        }
+
+        protected void doRun() {
+            Queue q = queue.get();
+            if(q!=null)
+                q.maintain();
+            else
+                cancel();
+        }
+    }
 }
-- 
GitLab