CODENVY-2217: Change checking for SSH agent readiness #5260
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
mmorhun
requested review from
skabashnyuk,
tolusha,
AndrienkoAleksandr and
bmicklea
AndrienkoAleksandr
approved these changes
Jun 1, 2017
tolusha
reviewed
Jun 1, 2017
| BufferedOutputStream sshRequest = new BufferedOutputStream(socket.getOutputStream()); | ||
| BufferedInputStream sshResponse = new BufferedInputStream(socket.getInputStream())) { | ||
| sshRequest.write(SSH_GLOBAL_REQUEST_BYTES); | ||
| sshRequest.flush(); |
tolusha
reviewed
Jun 1, 2017
| sshRequest.write(SSH_GLOBAL_REQUEST_BYTES); | ||
| sshRequest.flush(); | ||
| // Actual response is not needed, just make sure that ssh server give a response. | ||
| if (sshResponse.read() != -1) { |
There was a problem hiding this comment.
retrun sshResponse.read() != -1
There was a problem hiding this comment.
It seems to me that current code looks clearer.
tolusha
approved these changes
Jun 1, 2017
Signed-off-by: Mykola Morhun <mmorhun@codenvy.com>
bmicklea
added
the
kind/enhancement
bmicklea
approved these changes
Jun 1, 2017
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/2732/ |
skabashnyuk
approved these changes
Jun 2, 2017
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.
What does this PR do?
Changes checking algorithm for SSH agent.
Before, a readiness of SSH agent was checked by an attempt to open socket connection to SSH port of the machine. But this method doesn't work properly in some cases. For example, in case of docker-proxy socket connection will be opened, but actually the port isn't listening. This will cause workspace start failure.
That problem was fixed by changing of SSH agent readiness checking algorithm. Now checker tries to send a global SSH request and if SSH server is up, it should respond.
What issues does this PR fix or reference?
codenvy/codenvy#2217
Changelog
Improved SSH agent readiness checker.
Release Notes
Improved SSH agent readiness checker. This fixes workspace start failures from images without ssh server preinstalled.
Docs PR
N/A