[FIXED JENKINS-36144] Borrow the SCMTrigger's queue (or fall back to its queue size)

stephenc · stephenc · commit 3b8aaee438bf · 2016-06-22T12:19:45.000+01:00
diff --git a/src/main/java/com/cloudbees/jenkins/GitHubPushTrigger.java b/src/main/java/com/cloudbees/jenkins/GitHubPushTrigger.java
@@ -11,13 +11,17 @@
 import hudson.model.Item;
 import hudson.model.Job;
 import hudson.model.Project;
+import hudson.triggers.SCMTrigger;
 import hudson.triggers.Trigger;
 import hudson.triggers.TriggerDescriptor;
 import hudson.util.FormValidation;
+import hudson.util.NamingThreadFactory;
 import hudson.util.SequentialExecutionQueue;
 import hudson.util.StreamTaskListener;
+import java.lang.reflect.Field;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import jenkins.model.Jenkins;
-import jenkins.model.Jenkins.MasterComputer;
 import jenkins.model.ParameterizedJobMixIn;
 import jenkins.triggers.SCMTriggerItem.SCMTriggerItems;
 import org.apache.commons.jelly.XMLOutput;
@@ -45,7 +49,6 @@
 import java.util.Set;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
-import static org.jenkinsci.plugins.github.Messages.github_trigger_check_method_warning_details;
 import static org.jenkinsci.plugins.github.util.JobInfoHelpers.asParameterizedJobMixIn;
 
 /**
@@ -72,7 +75,9 @@ public void onPost() {
      */
     public void onPost(String triggeredByUser) {
         final String pushBy = triggeredByUser;
-        getDescriptor().queue.execute(new Runnable() {
+        DescriptorImpl d = getDescriptor();
+        d.checkThreadPoolSize();
+        d.queue.execute(new Runnable() {
             private boolean runPolling() {
                 try {
                     StreamTaskListener listener = new StreamTaskListener(getLogFile());
@@ -226,7 +231,7 @@ public void writeLogTo(XMLOutput out) throws IOException {
     @Extension
     public static class DescriptorImpl extends TriggerDescriptor {
         private final transient SequentialExecutionQueue queue =
-                new SequentialExecutionQueue(MasterComputer.threadPoolForRemoting);
+                new SequentialExecutionQueue(Executors.newSingleThreadExecutor(threadFactory()));
 
         private transient String hookUrl;
 
@@ -235,6 +240,43 @@ public static class DescriptorImpl extends TriggerDescriptor {
         @Inject
         private transient GitHubHookRegisterProblemMonitor monitor;
 
+        @Inject
+        private transient SCMTrigger.DescriptorImpl scmTrigger;
+
+        private transient int maximumThreads = Integer.MIN_VALUE;
+
+        private static ThreadFactory threadFactory() {
+            return new NamingThreadFactory(Executors.defaultThreadFactory(), "GitHubPushTrigger");
+        }
+
+        public DescriptorImpl() {
+            checkThreadPoolSize();
+        }
+
+        /**
+         * Update the {@link java.util.concurrent.ExecutorService} instance.
+         */
+        /*package*/
+        synchronized void checkThreadPoolSize() {
+            if (scmTrigger != null) {
+                int count = scmTrigger.getPollingThreadCount();
+                if (maximumThreads != count) {
+                    maximumThreads = count;
+                    try {
+                        Field getQueue = SCMTrigger.DescriptorImpl.class.getDeclaredField("queue");
+                        getQueue.setAccessible(true);
+                        SequentialExecutionQueue q = (SequentialExecutionQueue) getQueue.get(scmTrigger);
+                        this.queue.setExecutors(q.getExecutors());
+                    } catch (NoSuchFieldException | IllegalAccessException | ClassCastException e) {
+                        queue.setExecutors(
+                                (count == 0
+                                        ? Executors.newCachedThreadPool(threadFactory())
+                                        : Executors.newFixedThreadPool(maximumThreads, threadFactory())));
+                    }
+                }
+            }
+        }
+
         @Override
         public boolean isApplicable(Item item) {
             return item instanceof Job && SCMTriggerItems.asSCMTriggerItem(item) != null
@@ -351,7 +393,7 @@ public FormValidation doCheckHookRegistered(@AncestorInPath Job<?, ?> job) {
             for (GitHubRepositoryName repo : repos) {
                 if (monitor.isProblemWith(repo)) {
                     return FormValidation.warning(
-                            github_trigger_check_method_warning_details(
+                            org.jenkinsci.plugins.github.Messages.github_trigger_check_method_warning_details(
                                     repo.getUserName(), repo.getRepositoryName(), repo.getHost()
                             ));
                 }
