GEODE-6928 peer-to-peer SSL stream corruption with conserve-sockets=false #3759
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
…alse Modified the NioSslEngine to not modify the decrypted SSL buffer after reading a direct-ack response. This allows the readFully method to correctly see what bytes have already been consumed and correctly compact the buffer for subsequent reads, if necessary. The cluster communication test is modified to check for aborted connections created (retries) during operation distribution. Without the fix for the problem this check would fail.
jake-at-work
requested changes
Jun 28, 2019
geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
Outdated
Show resolved
Hide resolved
geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
Outdated
Show resolved
Hide resolved
geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
Show resolved
Hide resolved
geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
Outdated
Show resolved
Hide resolved
jake-at-work
approved these changes
Jul 1, 2019
|
Merged manually as 4803096 |
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.
Modified the NioSslEngine to not modify the decrypted SSL buffer after
reading a direct-ack response. This allows the readFully method to
correctly see what bytes have already been consumed and correctly
compact the buffer for subsequent reads, if necessary.
The cluster communication test is modified to check for aborted
connections created (retries) during operation distribution. Without the
fix for the problem this check would fail.
Thank you for submitting a contribution to Apache Geode.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
Has your PR been rebased against the latest commit within the target branch (typically
develop)?Is your initial contribution a single, squashed commit?
Does
gradlew buildrun cleanly?Have you written or updated unit tests to verify your changes?
If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
Note:
Please ensure that once the PR is submitted, check Concourse for build issues and
submit an update to your PR as soon as possible. If you need help, please send an
email to dev@geode.apache.org.