Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-51818] Add JNLP port availability check #275

Merged
merged 2 commits into from
Jun 21, 2018
Merged

[JENKINS-51818] Add JNLP port availability check #275

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
297782e
Add JNLP port availability check
andreilaptsinski Jun 8, 2018
7b48cea
Optimize output for log messages in port visible check
andreilaptsinski Jun 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions src/main/java/org/jenkinsci/remoting/engine/JnlpAgentEndpointResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.net.NoRouteToHostException;
import java.net.Proxy;
import java.net.ProxySelector;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketTimeoutException;
import java.net.URI;
Expand Down Expand Up @@ -279,6 +280,11 @@ public JnlpAgentEndpoint resolve() throws IOException {
firstError = chain(firstError, new IOException(jenkinsUrl + " is publishing an invalid port"));
continue;
}
if (!isPortVisible(host, port, 5000)) {
firstError = chain(firstError, new IOException(jenkinsUrl + " provided port:" + port
+ " is not reachable"));
continue;
}
// sort the URLs so that the winner is the one we try first next time
final String winningJenkinsUrl = jenkinsUrl;
Collections.sort(jenkinsUrls, new Comparator<String>() {
Expand Down Expand Up @@ -312,6 +318,32 @@ public int compare(String o1, String o2) {
return null;
}

private boolean isPortVisible(String hostname, int port, int timeout) {
boolean exitStatus = false;
Socket s = null;

try {
s = new Socket();
s.setReuseAddress(true);
SocketAddress sa = new InetSocketAddress(hostname, port);
s.connect(sa, timeout);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably `setSoTimeout()' for safety should be also defined

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

connect() method also has simple check for timeout value.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

connect timeout != readtimeout , there is no read here, but just in case something will try to read from stream it may stuck operation

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case we read nothing from socket. I think it is not necessary.

} catch (IOException e) {
LOGGER.warning(e.getMessage());
} finally {
if (s != null) {
if (s.isConnected()) {
exitStatus = true;
}
try {
s.close();
} catch (IOException e) {
LOGGER.warning(e.getMessage());
}
}
}
return exitStatus;
}

@Nonnull
private URL toAgentListenerURL(@Nonnull String jenkinsUrl) throws MalformedURLException {
return jenkinsUrl.endsWith("/")
Expand Down