optimize: refactor loadBalance config from registry.conf to file.conf. #3248

ls9527 · 2020-11-01T11:14:36Z

Ⅰ. Describe what this PR did

loadbalance 的配置在 registry.conf 文件，这个文件属于配置中心的基础配置，除了指定方式和基础信息以外，其他信息不应该在这个文件。把 loadBalance 改到核心配置文件中(file.conf).

例如随机负载均衡

loadBalance = {
    type = "RandomLoadBalance"
}

还有一致性hash负载均衡

loadBalance = {
    type = "ConsistentHashLoadBalance"
    visualNodes=10
}

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

caohdgege · 2020-11-01T16:29:15Z

[ERROR] /home/travis/build/seata/seata/seata-spring-boot-starter/src/test/java/io/seata/spring/boot/autoconfigure/PropertiesTest.java:[223,59] cannot find symbol
  symbol:   class LoadBalanceProperties
  location: class io.seata.spring.boot.autoconfigure.PropertiesTest
[ERROR] /home/travis/build/seata/seata/seata-spring-boot-starter/src/test/java/io/seata/spring/boot/autoconfigure/PropertiesTest.java:[224,42] cannot find symbol
  symbol:   class LoadBalanceProperties
  location: class io.seata.spring.boot.autoconfigure.PropertiesTest

caohdgege · 2020-11-01T16:29:34Z

处理一下ci的报错

funky-eyes

In addition, please in server/file. Conf. Example, script/server/conf and client/conf&spring, add configuration information

funky-eyes · 2020-11-02T02:37:35Z

seata-spring-boot-starter/src/test/java/io/seata/spring/boot/autoconfigure/PropertiesTest.java

-import io.seata.spring.boot.autoconfigure.properties.registry.RegistryRedisProperties;
-import io.seata.spring.boot.autoconfigure.properties.registry.RegistrySofaProperties;
-import io.seata.spring.boot.autoconfigure.properties.registry.RegistryZooKeeperProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.*;


is not allowed

funky-eyes · 2020-11-02T02:38:08Z

server/src/main/resources/registry.conf

@@ -1,8 +1,7 @@
 registry {
  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
  type = "file"
-  loadBalance = "RandomLoadBalance"
-  loadBalanceVirtualNodes = 10
+


Blank lines can be removed

funky-eyes · 2020-11-02T02:51:51Z

@ph3636 PTAL

codecov-io · 2020-11-02T12:49:02Z

Codecov Report

Merging #3248 (f977d55) into develop (ded2c83) will decrease coverage by 0.00%.
The diff coverage is 61.53%.

@@              Coverage Diff              @@
##             develop    #3248      +/-   ##
=============================================
- Coverage      51.54%   51.53%   -0.01%     
+ Complexity      3376     3375       -1     
=============================================
  Files            617      618       +1     
  Lines          20474    20477       +3     
  Branches        2567     2567              
=============================================
  Hits           10553    10553              
- Misses          8861     8862       +1     
- Partials        1060     1062       +2

Impacted Files	Coverage Δ	Complexity Δ
...ing/boot/autoconfigure/SeataAutoConfiguration.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (ø)`
...ta/spring/boot/autoconfigure/StarterConstants.java	`100.00% <ø> (ø)`	`1.00 <0.00> (ø)`
...figure/properties/registry/RegistryProperties.java	`60.00% <ø> (+6.15%)`	`2.00 <0.00> (-2.00)`	⬆️
...ure/properties/registry/LoadBalanceProperties.java	`55.55% <55.55%> (ø)`	`3.00 <3.00> (?)`
...scovery/loadbalance/ConsistentHashLoadBalance.java	`89.28% <100.00%> (ø)`	`3.00 <1.00> (ø)`
...eata/discovery/loadbalance/LoadBalanceFactory.java	`66.66% <100.00%> (+16.66%)`	`1.00 <1.00> (ø)`
...o/seata/server/coordinator/DefaultCoordinator.java	`53.92% <0.00%> (-0.50%)`	`28.00% <0.00%> (-1.00%)`
...in/java/io/seata/server/session/GlobalSession.java	`83.63% <0.00%> (-0.46%)`	`71.00% <0.00%> (-1.00%)`

ph3636 · 2020-11-02T12:59:33Z

Search it according to the keyword (loadBalanceVirtualNodes), or check it through git records, there are still many places that have not been changed.
根据关键词（loadBalanceVirtualNodes）搜一下，或者通过git记录看下，还有好多地方没改。

ls9527 · 2020-11-02T13:13:21Z

@ph3636 好的，修改了。
@caohdgege 已经提交了遗漏提交的文件

ph3636 · 2020-11-03T03:28:59Z

I think this configuration is more appropriate to put in the client, the server will not use this configuration
我觉得这个配置放到client中比较合适，server不会用到这个配置

ls9527 · 2020-11-03T04:21:53Z

I think this configuration is more appropriate to put in the client, the server will not use this configuration
我觉得这个配置放到client中比较合适，server不会用到这个配置

有道理阿，只有TM，RM才需要负载均衡。 TC都知道发给谁了，就不用均衡了。那我在改改

ph3636 · 2020-11-04T04:44:01Z

Change these files
改一下这些文件
script/client/spring/application.properties
script/client/spring/application.yml
META-INF/additional-spring-configuration-metadata.json

No configuration in these files
下面这些文件中可以不加配置
script/server/config

There are some other details, such as wrong name, extra blank lines, etc.
还有一些其他的细节，比如名字错误，多余空行等等

ph3636 · 2020-11-05T05:43:31Z

...a-discovery-core/src/main/java/io/seata/discovery/loadbalance/ConsistentHashLoadBalance.java

-    private static final String VIRTUAL_NODES = FILE_ROOT_REGISTRY + FILE_CONFIG_SPLIT_CHAR + "loadBalanceVirtualNodes";
-    private static final int VIRTUAL_NODES_NUM = ConfigurationFactory.CURRENT_FILE_INSTANCE.getInt(VIRTUAL_NODES, VIRTUAL_NODES_DEFAULT);
+    /**
+     * The constant LOAD_BALANCE_TYPE.


Change this name
改一下这个名字

Change the name or delete it

一直以为改了，今天核对才发现没改。刚刚改掉了

ph3636 · 2020-11-05T05:46:18Z

script/server/config/file.properties

@@ -25,3 +25,5 @@ store.redis.database=0
 store.redis.minConn=1
 store.redis.maxConn=10
 store.redis.queryLimit=100
+loadBalance.type=RandomLoadBalance
+loadBalance.consistentHash.virtualNodes=10


These are redundant
这些是多余

多余的删掉了

ph3636 · 2020-11-05T05:46:51Z

script/server/config/file.yml

+loadBalance:
+  type: RandomLoadBalance
+  consistentHash:
+    virtualNodes: 10


These are redundant
这些是多余

多谢大神，已将多余的部分删除。将loadBalance的 type 和 visualNodes 区分开了。

ph3636

LGTM

ph3636 · 2020-11-06T06:50:59Z

...a-discovery-core/src/main/java/io/seata/discovery/loadbalance/ConsistentHashLoadBalance.java

-    private static final String VIRTUAL_NODES = FILE_ROOT_REGISTRY + FILE_CONFIG_SPLIT_CHAR + "loadBalanceVirtualNodes";
-    private static final int VIRTUAL_NODES_NUM = ConfigurationFactory.CURRENT_FILE_INSTANCE.getInt(VIRTUAL_NODES, VIRTUAL_NODES_DEFAULT);
+    /**
+     * The constant LOAD_BALANCE_TYPE.


Change the name or delete it

…_1101 # Conflicts: # seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/StarterConstants.java

discovery/seata-discovery-core/src/test/resources/file.conf

script/server/config/file.conf

script/server/config/file.properties

script/server/config/file.yml

server/src/main/resources/file.conf

funky-eyes · 2020-11-25T10:30:20Z

请解决代码冲突

…balance_1101 # Conflicts: # discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/ConsistentHashLoadBalance.java # script/client/conf/file.conf # script/client/spring/application.properties # script/client/spring/application.yml # seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/SeataAutoConfiguration.java # seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/StarterConstants.java

funky-eyes

LGTM

l81893521 · 2021-02-18T02:23:00Z

changes/en-us/1.5.0.md

@@ -59,7 +59,7 @@
  - [[#3420](https://github.com/seata/seata/pull/3420)] optimize enumerated classes and add unit tests	
  - [[#3436](https://github.com/seata/seata/pull/3436)] optimize typo in SQLType class 	
  - [[#3439](https://github.com/seata/seata/pull/3439)] adjust the order of springApplicationContextProvider
-
+  - [[#3248](https://github.com/seata/seata/pull/3248)] optimize the config of load-balance migration to belong the client node


migrate instead of migration, migration is not a verb.

l81893521

LGTM

xingfudeshi

LGTM.

wangliang181230 · 2023-01-05T02:42:42Z

...a-discovery-core/src/main/java/io/seata/discovery/loadbalance/ConsistentHashLoadBalance.java

+    /**
+     * The constant LOAD_BALANCE_CONSISTENT_HASH_VISUAL_NODES.
+     */
+    public static final String LOAD_BALANCE_CONSISTENT_HASH_VISUAL_NODES = LOAD_BALANCE_PREFIX + "visualNodes";


@xingfudeshi
配置名 visualNodes 与 LoadBalanceProperties 类里的field virtualNodes 名不一致，导致在 SpringBootConfigurationProvider 下，获取字段时不存在，导致返回配置值为 null。
也就是说在springboot下，配置了seata.client.load-balance.visual-nodes 或 seata.client.load-balance.virtual-nodes都会导致配置读取不到。

public class SpringBootConfigurationProvider implements ExtConfigurationProvider { .... private Object getFieldValue(Object object, String fieldName, String dataId) throws IllegalAccessException { Optional<Field> fieldOptional = Stream.of(object.getClass().getDeclaredFields()) .filter(f -> f.getName().equalsIgnoreCase(fieldName)).findAny(); if (fieldOptional.isPresent()) { Field field = fieldOptional.get(); if (Objects.equals(field.getType(), Map.class)) { return getConfig(dataId, null, String.class); } field.setAccessible(true); Object defaultValue = field.get(object); return getConfig(dataId, defaultValue, field.getType()); } return null; } .... }

refactor: loadBalance config from registry.conf to file.conf.

3cc14a0

funky-eyes requested changes Nov 2, 2020

View reviewed changes

funky-eyes and others added 3 commits November 2, 2020 10:51

Merge branch 'develop' into feature/loadbalance_1101

3dad6cb

Merge branch 'develop' into feature/loadbalance_1101

29cc9be

支持CI持续集成, 补充遗漏提交的 LoadBalanceProperties

078f4c7

修改各大模块的负载均衡配置, 从registry.conf移动到file.conf

7baba8c

改为client.loadBalance。修复 SpringBootConfigurationProvider 配置支持

07bb4a9

修复springboot配置提示, 增加配置中心获取负载均衡的测试用例

c2c051e

ph3636 reviewed Nov 5, 2020

View reviewed changes

删除无用的负载均衡配置

48ca913

ph3636 approved these changes Nov 6, 2020

View reviewed changes

funky-eyes and others added 4 commits November 10, 2020 23:37

Merge branch 'develop' into feature/loadbalance_1101

147595a

Merge remote-tracking branch 'seata/develop' into feature/loadbalance…

811dd9f

…_1101 # Conflicts: # seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/StarterConstants.java

修复代码合并

1daf107

Merge branch 'develop' into feature/loadbalance_1101

882e4ee

funky-eyes reviewed Nov 22, 2020

View reviewed changes

discovery/seata-discovery-core/src/test/resources/file.conf Show resolved Hide resolved

修改 LOAD_BALANCE_CONSISTENT_HASH_VISUAL_NODES 的注释

986942e

funky-eyes requested changes Nov 22, 2020

View reviewed changes

script/server/config/file.conf Outdated Show resolved Hide resolved

script/server/config/file.properties Outdated Show resolved Hide resolved

script/server/config/file.yml Outdated Show resolved Hide resolved

server/src/main/resources/file.conf Outdated Show resolved Hide resolved

回滚不必要的配置更改

f645e9f

funky-eyes added this to the 1.5.0 milestone Nov 30, 2020

funky-eyes added module/config config module module/discovery discovery module labels Nov 30, 2020

ls9527 force-pushed the feature/loadbalance_1101 branch from b4f8a11 to f645e9f Compare January 16, 2021 15:36

funky-eyes approved these changes Jan 17, 2021

View reviewed changes

增加1.5.0的更新描述文档

dbe8743

l81893521 reviewed Feb 18, 2021

View reviewed changes

l81893521 approved these changes Feb 18, 2021

View reviewed changes

xingfudeshi added 2 commits March 19, 2021 10:31

Merge branch 'develop' into feature/loadbalance_1101

3a8e38e

Update SeataPropertiesAutoConfiguration.java

dea89bd

xingfudeshi self-requested a review March 19, 2021 02:48

xingfudeshi approved these changes Mar 19, 2021

View reviewed changes

xingfudeshi merged commit d28274d into apache:develop Mar 19, 2021

wangliang181230 reviewed Jan 5, 2023

View reviewed changes

xingfudeshi mentioned this pull request Jan 5, 2023

inconsistent configuration item names #5230

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

optimize: refactor loadBalance config from registry.conf to file.conf. #3248

optimize: refactor loadBalance config from registry.conf to file.conf. #3248

ls9527 commented Nov 1, 2020 •

edited by wangliang181230

caohdgege commented Nov 1, 2020 •

edited by wangliang181230

caohdgege commented Nov 1, 2020

funky-eyes left a comment

funky-eyes Nov 2, 2020

funky-eyes Nov 2, 2020

funky-eyes commented Nov 2, 2020

codecov-io commented Nov 2, 2020 •

edited

ph3636 commented Nov 2, 2020

ls9527 commented Nov 2, 2020

ph3636 commented Nov 3, 2020

ls9527 commented Nov 3, 2020

ph3636 commented Nov 4, 2020 •

edited

ph3636 Nov 5, 2020

ph3636 Nov 6, 2020

ls9527 Nov 22, 2020

ph3636 Nov 5, 2020

ls9527 Nov 22, 2020

ph3636 Nov 5, 2020

ls9527 Nov 5, 2020

ph3636 left a comment

ph3636 Nov 6, 2020

funky-eyes commented Nov 25, 2020

funky-eyes left a comment

l81893521 Feb 18, 2021

l81893521 left a comment

xingfudeshi left a comment

wangliang181230 Jan 5, 2023 •

edited

optimize: refactor loadBalance config from registry.conf to file.conf. #3248

optimize: refactor loadBalance config from registry.conf to file.conf. #3248

Conversation

ls9527 commented Nov 1, 2020 • edited by wangliang181230

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

caohdgege commented Nov 1, 2020 • edited by wangliang181230

caohdgege commented Nov 1, 2020

funky-eyes left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

funky-eyes commented Nov 2, 2020

codecov-io commented Nov 2, 2020 • edited

Codecov Report

ph3636 commented Nov 2, 2020

ls9527 commented Nov 2, 2020

ph3636 commented Nov 3, 2020

ls9527 commented Nov 3, 2020

ph3636 commented Nov 4, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ph3636 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

funky-eyes commented Nov 25, 2020

funky-eyes left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

l81893521 left a comment

Choose a reason for hiding this comment

xingfudeshi left a comment

Choose a reason for hiding this comment

wangliang181230 Jan 5, 2023 • edited

Choose a reason for hiding this comment

ls9527 commented Nov 1, 2020 •

edited by wangliang181230

caohdgege commented Nov 1, 2020 •

edited by wangliang181230

codecov-io commented Nov 2, 2020 •

edited

ph3636 commented Nov 4, 2020 •

edited

wangliang181230 Jan 5, 2023 •

edited