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.

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

ZOOKEEPER-3388: Allow client port to support plaintext and encrypted connections simultaneously (3.5) #1174

Closed
wants to merge 2 commits into from

Conversation

anmolnar
Copy link
Contributor

@anmolnar anmolnar commented Dec 11, 2019

Backport of #944

…connections simultaneously

Author: Brian Nixon <nixon@fb.com>

Reviewers: Enrico Olivelli <eolivelli@gmail.com>, Michael Han <hanm@apache.org>

Closes apache#944 from enixon/client-port-uni
@anmolnar anmolnar changed the title ZOOKEEPER-3388: Allow client port to support plaintext and encrypted connections simultaneously ZOOKEEPER-3388: Allow client port to support plaintext and encrypted connections simultaneously (3.5) Dec 11, 2019
@anmolnar
Copy link
Contributor Author

@nkalmar @symat PTAL.

@anmolnar anmolnar self-assigned this Dec 11, 2019
Copy link
Contributor

@symat symat left a comment

Choose a reason for hiding this comment

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

LGTM
(I also downloaded the patch and did a build locally with java 1.8 and executed the new unit test)

I added a minor comment about the documentation.

Also I think it would worth to backport https://issues.apache.org/jira/browse/ZOOKEEPER-3643 too (if/when it will be merged to master), as it enhances the documentation and the same testcase we backport in this PR.


* *client.portUnification*:
(Java system properties: **zookeeper.client.portUnification**)
Specifies that the client port should accept SSL connections
Copy link
Contributor

Choose a reason for hiding this comment

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

please add the tag: **New in 3.5.7:**

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is done. Thanks.

@asf-ci
Copy link

asf-ci commented Dec 11, 2019

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/PreCommit-ZOOKEEPER-github-pr-build-maven/1709/

@anmolnar
Copy link
Contributor Author

Based on the approvals in the master patch #944 , I'll commit this patch once the build is green.

@asf-ci
Copy link

asf-ci commented Dec 16, 2019

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/PreCommit-ZOOKEEPER-github-pr-build-maven/1735/

asfgit pushed a commit that referenced this pull request Dec 16, 2019
…connections simultaneously (3.5)

Backport of #944

Author: Andor Molnar <andor@apache.org>
Author: Brian Nixon <nixon@fb.com>

Reviewers: andor@apache.org

Closes #1174 from anmolnar/ZOOKEEPER-3388_35 and squashes the following commits:

b51f843 [Andor Molnar] ZOOKEEPER-3388. Added new tag to documentation
744c938 [Brian Nixon] ZOOKEEPER-3388: Allow client port to support plaintext and encrypted connections simultaneously
@anmolnar
Copy link
Contributor Author

Merged. Thanks.

@anmolnar anmolnar closed this Dec 16, 2019
@anmolnar anmolnar deleted the ZOOKEEPER-3388_35 branch December 17, 2019 11:48
anmolnar added a commit to anmolnar/zookeeper that referenced this pull request May 21, 2024
…d encrypted connections simultaneously (3.5)

Backport of apache#944

Author: Andor Molnar <andor@apache.org>
Author: Brian Nixon <nixon@fb.com>

Reviewers: andor@apache.org

Closes apache#1174 from anmolnar/ZOOKEEPER-3388_35 and squashes the following commits:

b51f843 [Andor Molnar] ZOOKEEPER-3388. Added new tag to documentation
744c938 [Brian Nixon] ZOOKEEPER-3388: Allow client port to support plaintext and encrypted connections simultaneously

(cherry picked from commit f21f951)
Change-Id: I3481b36a065f036bc64f07cd82146935ec8bdd9f
(cherry picked from commit 4c05e68)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants