Merge pull request #93 from jenkinsci/jenkins-37031

[FIXED JENKINS-37031] tcpSlaveAgentListener should publish supported agent protocols to speed up connection setup
jenkinsci · Aug 6, 2016 · 802fb13 · 802fb13
2 parents 53c8860 + d54c886
commit 802fb13
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/src/main/java/hudson/remoting/Engine.java b/src/main/java/hudson/remoting/Engine.java
@@ -39,7 +39,9 @@
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;
 import javax.annotation.CheckForNull;
 import javax.annotation.concurrent.NotThreadSafe;
@@ -214,6 +216,7 @@ public void run() {
                 Throwable firstError=null;
                 String host=null;
                 String port=null;
+                Set<String> agentProtocolNames = null;
                 SSLSocketFactory sslSocketFactory = getSSLSocketFactory();
 
                 for (URL url : candidateUrls) {
@@ -247,6 +250,16 @@ public void run() {
                         }
                         host = con.getHeaderField("X-Jenkins-JNLP-Host"); // controlled by hudson.TcpSlaveAgentListener.hostName
                         if (host == null) host=url.getHost();
+                        String names = con.getHeaderField("X-Jenkins-Agent-Protocols");
+                        if (names != null) {
+                            agentProtocolNames = new HashSet<String>();
+                            for (String name: names.split(",")) {
+                                name = name.trim();
+                                if (!name.isEmpty()) {
+                                    agentProtocolNames.add(name);
+                                }
+                            }
+                        }
                     } finally {
                         con.disconnect();
                     }
@@ -277,6 +290,10 @@ public void run() {
                         events.status("Protocol " + protocol.getName() + " is not enabled, skipping");
                         continue;
                     }
+                    if (agentProtocolNames != null && !agentProtocolNames.contains(protocol.getName())) {
+                        events.status("Server reports protocol " + protocol.getName() + " not supported, skipping");
+                        continue;
+                    }
                     triedAtLeastOneProtocol = true;
                     events.status("Trying protocol: " + protocol.getName());
                     try {