feature:Support to obtain multiple configurations through a single key in etcd3 #3327
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
# Conflicts: # config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfiguration.java
|
@a364176773 |
� Conflicts: � script/server/config/registry.yml
Codecov Report
@@ Coverage Diff @@
## develop #3327 +/- ##
==========================================
Coverage 51.56% 51.56%
- Complexity 3373 3375 +2
==========================================
Files 617 617
Lines 20438 20442 +4
Branches 2565 2565
==========================================
+ Hits 10538 10541 +3
- Misses 8839 8842 +3
+ Partials 1061 1059 -2
|
|
这个pr冲突也解决一下 |
added 2 commits
September 8, 2021 16:46
� Conflicts: � changes/1.5.0.md � changes/en-us/1.5.0.md � config/seata-config-etcd3/src/main/java/io/seata/config/etcd3/EtcdConfiguration.java � script/server/config/registry.conf � script/server/config/registry.properties � script/server/config/registry.yml � server/src/main/resources/registry.conf
Codecov Report
@@ Coverage Diff @@
## develop #3327 +/- ##
=============================================
+ Coverage 49.34% 49.38% +0.04%
- Complexity 3721 3725 +4
=============================================
Files 692 692
Lines 23419 23443 +24
Branches 2902 2911 +9
=============================================
+ Hits 11555 11578 +23
+ Misses 10701 10699 -2
- Partials 1163 1166 +3
|
@a364176773 解决好了，已经提交了 |
ok,consul那个pr我解决了下冲突合并进去了,你看下我解决的有没有问题,如果有问题再提个fix的pr |
funky-eyes
reviewed
Sep 11, 2021
config/seata-config-etcd3/src/main/java/io/seata/config/etcd3/EtcdConfiguration.java
Outdated
Show resolved
Hide resolved
added 3 commits
September 13, 2021 10:44
� Conflicts: � changes/1.5.0.md � changes/en-us/1.5.0.md
funky-eyes
approved these changes
Sep 13, 2021
|
https://cla-assistant.io/seata/seata 请登录对应的github账号打开cla链接签署，感谢大家配合 |
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
添加从etcd3单一key获取多条配置功能，registry.conf文件添加config.etcd3.key属性用于指定etcd3中的key。
Ⅱ. Does this pull request fix one issue?
#2506 #2316
Ⅲ. Why don't you add test cases (unit test/integration test)?
此功能在原有功能上修改，不方便写测试用例。
Ⅳ. Describe how to verify it
其他功能正常配置后，在registry.conf文件中将config.type设置为“etcd3”，添加config.etcd3.key属性，属性值为etcd3中的key，例如“seata.properties”，启动seata应用（server或client都可以），会自动拉取etcd3上“seata.properties”中的配置。
应用中的配置如下，根据项目选择对应的配置方式：
application.yml
registry.conf
etcd3中的属性配置如下：
Ⅴ. Special notes for reviews
将config.type设置为“etcd3”。
此功能已实现动态配置，同时兼容旧的配置方式。
seata-server也可以通过这种方式配置。
由于etcd3没有可视化界面，建议使用脚本导入配置，或自行开发对应的ui界面。