bugfix: fix the issue of missing sentinel password in store redis mode #5930
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
funky-eyes
reviewed
Oct 14, 2023
| import redis.clients.jedis.JedisPoolAbstract; | ||
| import redis.clients.jedis.JedisPoolConfig; | ||
| import redis.clients.jedis.JedisSentinelPool; | ||
| import redis.clients.jedis.*; |
| @@ -98,7 +94,8 @@ public static JedisPoolAbstract getJedisPoolInstance(JedisPoolAbstract... jedisP | |||
| Set<String> sentinels = new HashSet<>(SENTINEL_HOST_NUMBER); | |||
| String[] sentinelHosts = CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_SENTINEL_HOST).split(","); | |||
| Arrays.asList(sentinelHosts).forEach(sentinelHost -> sentinels.add(sentinelHost)); | |||
| tempJedisPool = new JedisSentinelPool(masterName, sentinels, poolConfig, 60000, password, CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_DATABASE, DATABASE)); | |||
| tempJedisPool = new JedisSentinelPool(masterName, sentinels, poolConfig, 60000, 60000, password, CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_DATABASE, DATABASE), | |||
| null, Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT, CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_SENTINEL_PASSWORD), null); | |||
There was a problem hiding this comment.
clientName、sentinelClientName
funky-eyes
reviewed
Oct 14, 2023
script/config-center/config.txt
Outdated
There was a problem hiding this comment.
不止这里,server的yml里的配置要补充,以及starter模块里对应的properties也要补充
PeppaO
changed the title
PeppaO
changed the title
|
|
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## 2.x #5930 +/- ##
============================================
+ Coverage 49.50% 49.51% +0.01%
- Complexity 4510 4515 +5
============================================
Files 854 854
Lines 29876 29880 +4
Branches 3660 3660
============================================
+ Hits 14789 14795 +6
+ Misses 13601 13595 -6
- Partials 1486 1490 +4
|
funky-eyes
added
type: bug
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.
Ⅰ. Describe what this PR did
当store.redis.mode=sentinel时，设置哨兵密码时，代码中缺少哨兵密码
Ⅱ. Does this pull request fix one issue?
Fixes #4161
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews