feature: support redis sentinel mode #3348
Merged
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
Dec 8, 2020
server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java
Outdated
Show resolved
Hide resolved
|
script/config-center/config.txt 需要修改 |
|
application.properties, application.yml这些文件也要改一下 |
|
additional-spring-configuration-metadata.json 这个文件把配置提示加上。 |
caohdgege
reviewed
Dec 8, 2020
| import redis.clients.jedis.Jedis; | ||
| import redis.clients.jedis.JedisPool; | ||
| import redis.clients.jedis.JedisPoolConfig; | ||
| import redis.clients.jedis.*; |
caohdgege
reviewed
Dec 8, 2020
| if (StringUtils.isBlank(masterName)) { | ||
| throw new RedisException("The masterName is null in redis sentinel mode"); | ||
| } | ||
| Set<String> sentinels = new HashSet<>(); |
There was a problem hiding this comment.
可以，因为set存sentinel节点信息，节点数量固定是3
server/src/main/resources/file.conf
Outdated
| @@ -40,8 +40,19 @@ store { | |||
|
|
|||
| ## redis store property | |||
| redis { | |||
| host = "127.0.0.1" | |||
| port = "6379" | |||
| ## redis mode: single、sentinel | |||
| jedisPool = new JedisSentinelPool(masterName, sentinels, poolConfig, 60000, password, | ||
| CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_DATABASE, DATABASE)); | ||
| } else if (mode.equals(ConfigurationKeys.REDIS_SINGLE_MODE)) { | ||
| String host = StringUtils.isBlank(CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_SINGLE_HOST)) ? |
There was a problem hiding this comment.
CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_SINGLE_HOST) 调了两次，可以用个变量接一下，下面的CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_SINGLE_PORT)也是
caohdgege
reviewed
Dec 26, 2020
| @@ -125,3 +125,38 @@ seata.registry.custom.name= | |||
|
|
|||
| seata.registry.load-balance=RandomLoadBalance | |||
| seata.registry.load-balance-virtual-nodes=10 | |||
|
|
|||
Codecov Report
@@ Coverage Diff @@
## develop #3348 +/- ##
=============================================
- Coverage 51.72% 51.71% -0.02%
- Complexity 3347 3353 +6
=============================================
Files 617 617
Lines 20256 20271 +15
Branches 2540 2544 +4
=============================================
+ Hits 10478 10483 +5
- Misses 8727 8740 +13
+ Partials 1051 1048 -3
|
funky-eyes
approved these changes
Dec 27, 2020
funky-eyes
added
the
type: feature
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
supports transaction session storage for redis sentinel mode
Ⅱ. Does this pull request fix one issue?
fixes #3339
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews