Branch 3.5.4 #5
Open
Branch 3.5.4 #5
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
(Arshad Mohammad via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1715591 13f79535-47bb-0310-9956-ffa450edef68
(Arshad Mohammad via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1718122 13f79535-47bb-0310-9956-ffa450edef68
(Arshad Mohammad via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1718124 13f79535-47bb-0310-9956-ffa450edef68
(Arshad Mohammad via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1718206 13f79535-47bb-0310-9956-ffa450edef68
(Marshall McMullen via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1718208 13f79535-47bb-0310-9956-ffa450edef68
(Arshad Mohammad via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1718213 13f79535-47bb-0310-9956-ffa450edef68
(Arshad Mohammad via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1718215 13f79535-47bb-0310-9956-ffa450edef68
… constructor (Arshad Mohammad via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1718252 13f79535-47bb-0310-9956-ffa450edef68
(Arshad Mohammad via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1718254 13f79535-47bb-0310-9956-ffa450edef68
…roperties (Arshad Mohammad via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1718256 13f79535-47bb-0310-9956-ffa450edef68
(Akihiro Suda via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1718512 13f79535-47bb-0310-9956-ffa450edef68
(Arshad Mohammad via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1718759 13f79535-47bb-0310-9956-ffa450edef68
(Arshad Mohammad via rgs) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1719012 13f79535-47bb-0310-9956-ffa450edef68
….StaticHostProviderTest (Timothy Ward via cnauroth) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1719205 13f79535-47bb-0310-9956-ffa450edef68
…ven) (fpj via cnauroth) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1719529 13f79535-47bb-0310-9956-ffa450edef68
…cnauroth) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1720228 13f79535-47bb-0310-9956-ffa450edef68
… manager" (Arshad Mohammad via rakeshr) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1725873 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1726355 13f79535-47bb-0310-9956-ffa450edef68
…aseaudit (phunt via cnauroth) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1728578 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1729260 13f79535-47bb-0310-9956-ffa450edef68
…ch ZooKeeperSaslClient instance (yuemeng via rakeshr) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1733222 13f79535-47bb-0310-9956-ffa450edef68
…Keeper process is already running (gsbiju via phunt) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1733347 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1733490 13f79535-47bb-0310-9956-ffa450edef68
…via phunt) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1733500 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1733506 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1733509 13f79535-47bb-0310-9956-ffa450edef68
… an added file (phunt) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1733526 13f79535-47bb-0310-9956-ffa450edef68
… cnauroth) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1733680 13f79535-47bb-0310-9956-ffa450edef68
…phunt) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1734347 13f79535-47bb-0310-9956-ffa450edef68
… value (Botond Hejj via phunt) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1734499 13f79535-47bb-0310-9956-ffa450edef68
…e hardcode test folders A little bit more than just fixing the hardcoded folder names. Because the original issue was only on the 3.4 branch, the unit test has also been added to that branch only. In this PR I add the fixed version of test to the master branch. Should be committed to 3.5 as well and I'll create a separate PR for 3.4 https://issues.apache.org/jira/browse/ZOOKEEPER-3012 Author: Andor Molnar <[email protected]> Reviewers: [email protected] Closes apache#514 from anmolnar/ZOOKEEPER-3012 Change-Id: Iabba2630008158580a121a007a5c45b43a301315 (cherry picked from commit 43f117e) Signed-off-by: Patrick Hunt <[email protected]>
A few nitpicks which needs to be cleaned up: 1. Rename OldEphemeralType --> EphemeralTypeEmulate353 2. Remove unused method: getTTL() 3. Remove unused import from QuorumPeer Author: Andor Molnar <[email protected]> Reviewers: [email protected] Closes apache#516 from anmolnar/ZOOKEEPER-3038 Change-Id: Iec537706a35863d53daa593da2b01f6e523ef466 (cherry picked from commit 6e64125) Signed-off-by: Patrick Hunt <[email protected]>
Fixed by creating a single Scanner for all queries in the main() method. Author: Andor Molnar <[email protected]> Reviewers: [email protected] Closes apache#517 from anmolnar/ZOOKEEPER-3039 and squashes the following commits: a35e2e2 [Andor Molnar] ZOOKEEPER-3039. Optimize imports a196443 [Andor Molnar] ZOOKEEPER-3039. Use the same Scanner for all queries Change-Id: Icf66888d4e6ad902615ed8ffde58a5a8fdd41237 (cherry picked from commit 2fa315b) Signed-off-by: Patrick Hunt <[email protected]>
Making the throttle check before passing over the request to the next thread will prevent the possibility of throttling code running after unthrottle Added an additional async hammer thread which is pretty reliably reproduces the race condition. The globalOutstandingLimit is decreased so throttling code is executed. Author: Botond Hejj <[email protected]> Reviewers: Andor Molnár <[email protected]>, Norbert Kalmar <[email protected]>, Benjamin Reed <[email protected]> Closes apache#563 from bothejjms/ZOOKEEPER-3072 (cherry picked from commit 2a372fc) Signed-off-by: Benjamin Reed <[email protected]>
RokLenarcic
pushed a commit
that referenced
this pull request
Sep 3, 2022
This is a master branch version of: apache#654 The previous PR was for branch 3.5, and couldn't be merged as that branch is closed for new features. The Zookeeper libraries currently allow you to set up your SSL Context via system properties such as "zookeeper.ssl.keyStore.location" in the X509Util. This covers most simple use cases, where users have software keystores on their harddrive. There are, however, a few additional scenarios that this doesn't cover. Two possible ones would be: 1. The user has a hardware keystore, loaded in using PKCS11 or something similar. 2. The user has no access to the software keystore, but can retrieve an already-constructed SSLContext from their container. For this, I would propose that the X509Util be extended to allow a user to set a property "zookeeper.ssl.client.context" to provide a class which supplies a custom SSL context. This gives a lot more flexibility to the ZK client, and allows the user to construct the SSLContext in whatever way they please (which also future proofs the implementation somewhat). I added a few simple tests to this class around setting the SSLContext, and setting an invalid one. I'm not testing the actual functionality of the SSLContext, etc. Author: Alex Rankin <[email protected]> Author: Alex Rankin <[email protected]> Reviewers: [email protected] Closes apache#728 from arankin-irl/ZOOKEEPER-3160 and squashes the following commits: a20c62f [Alex Rankin] Merge branch 'master' into ZOOKEEPER-3160 5a9b8fc [Alex Rankin] Merge pull request #7 from apache/master 3c3dfdd [Alex Rankin] Re-ordering imports. 69e0b6c [Alex Rankin] Updating custom SSLContext supplier with review comments 874529b [Alex Rankin] Using supplier interface instead of custom interface, and renaming property ec27260 [Alex Rankin] Merge branch 'master' into ZOOKEEPER-3160 75a010e [Alex Rankin] Merge pull request #6 from apache/master 838f61c [Alex Rankin] Merge branch 'master' into ZOOKEEPER-3160 f85d7e5 [Alex Rankin] Merge pull request #5 from apache/master 31d8dd5 [Alex Rankin] Extracting SSLContext creation from config to new method. 400839a [Alex Rankin] Adding ability to specify custom SSLContext for client 7ae7485 [Alex Rankin] Merge pull request #4 from apache/master
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.
No description provided.