Implement ability to connect to Sentinel with TLS #2139
Closed
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
sazzad16
suggested changes
Mar 22, 2020
| @@ -28,6 +32,12 @@ | |||
| protected String sentinelPassword; | |||
| protected String sentinelClientName; | |||
|
|
|||
| protected boolean isRedisSslEnabled; | |||
There was a problem hiding this comment.
Master would be better that Redis. E.g. isMasterSslEnabled. Also, apply this change entire PR.
Comment on lines
105
to
+111
| public JedisSentinelPool(String masterName, Set<String> sentinels, | ||
| final GenericObjectPoolConfig poolConfig, final int connectionTimeout, final int soTimeout, | ||
| final String password, final int database, final String clientName, | ||
| final int sentinelConnectionTimeout, final int sentinelSoTimeout, final String sentinelPassword, | ||
| final String sentinelClientName) { | ||
| final String sentinelClientName, final boolean isRedisSslEnabled, final boolean isSentinelSslEnabled, | ||
| final SSLSocketFactory sslSocketFactory, final SSLParameters sslParameters, | ||
| final HostnameVerifier hostnameVerifier) { |
There was a problem hiding this comment.
DON'T change an existing constructor or public method. Create a new one.
| } | ||
|
|
||
| public MasterListener(String masterName, String host, int port, | ||
| long subscribeRetryWaitTimeMillis) { | ||
| this(masterName, host, port); | ||
| long subscribeRetryWaitTimeMillis) { |
There was a problem hiding this comment.
Suggested change
| long subscribeRetryWaitTimeMillis) { | |
| long subscribeRetryWaitTimeMillis) { |
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.
This change allows connecting to sentinel via TLS. Additionally, you can specify if you want to connect to the redis master with TLS or not.
When connecting to sentinel with TLS, it will still broadcast the non-TLS ports for redis. For this scenario to work,
toHostAndPortwas modified to be protected so consumers can sub-class JedisSentinelPool and implement your own port mapping behavior.