[FIXED JENKINS-38539] Turn on SO_KEEPALIVE and provide CLI option to turn it off again #110
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…turn it off again - Most OSes have a default SO_KEEPALIVE of 2 hours, and perform keepalive without generating any significant traffic The master side of the connection already has SO_KEEPALIVE enabled, this just allows both OSes to keep their own guidance and therefore assist when tuning the agent side is more appropriate than changing the kernel parameters on the master side (as the master is handling the HTTP requests of users) - Would probably be perfectly safe to not even expose the -noKeepAlive option as the SO_KEEPALIVE should be invisible But there may be users that have the requirement to disable, so safer to provide the option - Change was developed against the stable-2.x branch
| @@ -189,6 +189,10 @@ public boolean verify(String s, SSLSession sslSession) { | |||
| @Option(name="-noReconnect",usage="Doesn't try to reconnect when a communication fail, and exit instead") | |||
| public boolean noReconnect = false; | |||
|
|
|||
| @Option(name = "-noKeepAlive", | |||
| usage = "Do not open the socket to the master with SO_KEEPALIVE enabled") | |||
There was a problem hiding this comment.
This does not tell me much as a user. Why would I want that?
There was a problem hiding this comment.
I would argue that you do not want this unless you know why you do not want it... I could make it a system property rather than a CLI option... should only be required if we have a fundamental misunderstanding of how sockets work...
There was a problem hiding this comment.
I would also rephrase it a bit
There was a problem hiding this comment.
@olivergondza My plan is to create a documentation page, which will clarify options and their potential impact. By now I think the current summary string is acceptable. Do you agree?
|
This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation. |
|
🐝 |
1 similar comment
|
🐝 |
|
@reviewbybees done |
|
This pull request has completed our internal processes and we now respectfully request the maintainers of this repository to consider our proposal contained within this pull request for merging. |
|
It's in the plan for the next release and hopefully 2.19.2 |
oleg-nenashev
added a commit
to jenkinsci/jenkins
that referenced
this pull request
Oct 9, 2016
2.61 does not exist, there was an issue during the release Changes in 2.62: https://github.com/jenkinsci/remoting/blob/stable-2.x/CHANGELOG.md#2622 * [JENKINS-38539](https://issues.jenkins-ci.org/browse/JENKINS-38539) - Stability: Turn on SO_KEEPALIVE and provide CLI option to turn it off again. (jenkinsci/remoting#110) * [JENKINS-37539](https://issues.jenkins-ci.org/browse/JENKINS-37539) - Prevent <code>NullPointerException</code> in <code>Engine#connect()</code> when host or port parameters are <code>null</code> or empty. (jenkinsci/remoting#101) * [CID-152201] - Fix resource leak in <code>remoting.jnlp.Main</code>. (jenkinsci/remoting#102) * [CID-152200,CID-152202] - Resource leak in Encryption Cipher I/O streams on exceptional paths. (jenkinsci/remoting#104)
oleg-nenashev
added a commit
to jenkinsci/jenkins
that referenced
this pull request
Oct 11, 2016
…2585) 2.61 does not exist, there was an issue during the release Changes in 2.62: https://github.com/jenkinsci/remoting/blob/stable-2.x/CHANGELOG.md#2622 * [JENKINS-38539](https://issues.jenkins-ci.org/browse/JENKINS-38539) - Stability: Turn on SO_KEEPALIVE and provide CLI option to turn it off again. (jenkinsci/remoting#110) * [JENKINS-37539](https://issues.jenkins-ci.org/browse/JENKINS-37539) - Prevent <code>NullPointerException</code> in <code>Engine#connect()</code> when host or port parameters are <code>null</code> or empty. (jenkinsci/remoting#101) * [CID-152201] - Fix resource leak in <code>remoting.jnlp.Main</code>. (jenkinsci/remoting#102) * [CID-152200,CID-152202] - Resource leak in Encryption Cipher I/O streams on exceptional paths. (jenkinsci/remoting#104)
oleg-nenashev
added a commit
to jenkinsci/jenkins
that referenced
this pull request
Nov 6, 2016
This PR picks the latest available version of remoting stable-2.x. All the fixes have been integrated into remoting-3.0 and soaked enough. * [JENKINS-38539](https://issues.jenkins-ci.org/browse/JENKINS-38539) - Stability: Turn on SO_KEEPALIVE by default and provide CLI option to turn it off again. (jenkinsci/remoting#110) * [JENKINS-37539](https://issues.jenkins-ci.org/browse/JENKINS-37539) - Prevent <code>NullPointerException</code> in <code>Engine#connect()</code> when host or port parameters are <code>null</code> or empty. (jenkinsci/remoting#101) * [CID-152201] - Fix resource leak in <code>remoting.jnlp.Main</code>. (jenkinsci/remoting#102) * [CID-152200,CID-152202] - Resource leak in Encryption Cipher I/O streams on exceptional paths. (jenkinsci/remoting#104)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See JENKINS-38539
Will need to be merged up to master also
@reviewbybees @jenkinsci/code-reviewers