From f470b8eaf95153b4a8b44fa524fadfa1b56fd957 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Sat, 22 Oct 2016 23:19:22 +0200 Subject: [PATCH] [JENKINS-39161] - Update JNLP4-plaintext documentation according to comments from @stephenc --- CHANGELOG.md | 2 +- docs/protocols.md | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63b689f5a..b83cbb29d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ See (see [Remoting 3 Compatibility Notes](docs/remoting-3-compatibility.md)) for Enhancements: * [JENKINS-36871](https://issues.jenkins-ci.org/browse/JENKINS-36871) - -JNLP4-connect and JNLP4-plaintext protocols, which Java improves performance and stability compared to the JNLP3 protocol. +New JNLP4-connect protocol, which improves performance and stability compared to the JNLP3 protocol. (https://github.com/jenkinsci/remoting/pull/92) * [JENKINS-37565](https://issues.jenkins-ci.org/browse/JENKINS-37565) - Update the required Java version to Java 7, Java 6 is not supported anymore. diff --git a/docs/protocols.md b/docs/protocols.md index 96bbac76e..3161d4ead 100644 --- a/docs/protocols.md +++ b/docs/protocols.md @@ -53,12 +53,14 @@ Protocol uses non-blocking I/O wherever possible which removes the performance b ### JNLP4-plaintext * Introduced in: Remoting 3.0, [JENKINS-36871](https://issues.jenkins-ci.org/browse/JENKINS-36871) -* Use with caution +* For performance testing **only**, not supported for other purposes +* Cannot be used in Jenkins -The protocol is similar to JNLP4-plaintext, - but it does not setup the TLS encryption between agent and master. -In particular cases it may expose the secret data. +This protocol was developed to allow for like for like performance comparison + between the original NIO engine used by JNLP2-connect and the new NIO engine + used by JNLP4-connect. -On the other had, the protocol allows to get extra performance in the case when the remoting layer does not need its own encryption - (e.g. when the connection goes within a secured VPN). +The protocol is similar to JNLP4-connect, + but it does not setup the TLS encryption between agent and master. +As this protocol is plaintext it is not for use outside of like for like performance testing.