feature: support group configuration in nacos registry #2620

hsoftxl · 2020-04-27T04:00:49Z

发现TC服务支持配置Group

codecov-io · 2020-04-27T04:10:15Z

Codecov Report

Merging #2620 into develop will decrease coverage by 0.00%.
The diff coverage is 50.00%.

@@              Coverage Diff              @@
##             develop    #2620      +/-   ##
=============================================
- Coverage      50.81%   50.80%   -0.01%     
+ Complexity      2814     2812       -2     
=============================================
  Files            558      558              
  Lines          17931    17931              
  Branches        2126     2124       -2     
=============================================
- Hits            9111     9110       -1     
- Misses          7953     7954       +1     
  Partials         867      867

Impacted Files	Coverage Δ	Complexity Δ
...e/properties/registry/RegistryNacosProperties.java	`51.72% <50.00%> (-0.28%)`	`8.00 <1.00> (+1.00)`	⬇️
...o/seata/server/coordinator/DefaultCoordinator.java	`54.63% <0.00%> (-0.52%)`	`28.00% <0.00%> (-1.00%)`
...in/java/io/seata/server/session/GlobalSession.java	`83.71% <0.00%> (-0.46%)`	`71.00% <0.00%> (-1.00%)`
...n/java/io/seata/rm/datasource/DataSourceProxy.java	`37.73% <0.00%> (+0.89%)`	`10.00% <0.00%> (-1.00%)`	⬆️

funky-eyes · 2020-04-27T04:39:47Z

please use English for the title

l81893521 · 2020-04-27T06:15:58Z

Please solve the conflict.

funky-eyes · 2020-04-27T07:34:31Z

模仿一下其他读取key,跟默认值的做法,不要直接从nacos拿key,而要作为一个开放出去的key,config跟registry下的nacos也要进行添加对应的配置.比如

      nacos:
         application: seata-server
         serverAddr: 127.0.0.1:8848
         namespace:
         username: ""
         password: ""

你需要把你修改的group补充进去

l81893521 · 2020-04-27T08:34:11Z

Please change the title begin with "feature: ".

codecov-commenter · 2020-05-20T01:28:11Z

Codecov Report

Merging #2620 into develop will increase coverage by 0.01%.
The diff coverage is 50.00%.

@@              Coverage Diff              @@
##             develop    #2620      +/-   ##
=============================================
+ Coverage      50.14%   50.15%   +0.01%     
- Complexity      2951     2956       +5     
=============================================
  Files            591      591              
  Lines          18950    18954       +4     
  Branches        2285     2284       -1     
=============================================
+ Hits            9502     9506       +4     
- Misses          8503     8505       +2     
+ Partials         945      943       -2

Impacted Files	Coverage Δ	Complexity Δ
...e/properties/registry/RegistryNacosProperties.java	`51.72% <50.00%> (-0.28%)`	`8.00 <1.00> (+1.00)`	⬇️
...in/java/io/seata/server/session/GlobalSession.java	`84.16% <0.00%> (+0.45%)`	`72.00% <0.00%> (+1.00%)`
...o/seata/server/coordinator/DefaultCoordinator.java	`55.15% <0.00%> (+0.51%)`	`29.00% <0.00%> (+1.00%)`

funky-eyes · 2020-05-21T02:55:14Z

你确定测试了这个pr吗?我的服务分组名称还是DEFAULT_GROUP

funky-eyes · 2020-05-21T03:17:37Z

register&unregister&subscribe Instance missing service group name

hsoftxl · 2020-05-25T06:12:41Z

已修改

l81893521 · 2020-05-25T06:20:10Z

server/src/main/resources/registry.conf

@@ -5,7 +5,8 @@ registry {
  nacos {
    application = "seata-server"
    serverAddr = "127.0.0.1:8848"
-    namespace = ""
+    group = "SEATA_GROUP"
+    namespace = "publiic"


wrong word spell. please fix.

l81893521 · 2020-05-25T06:38:54Z

server/src/main/resources/registry.conf

@@ -58,7 +59,7 @@ config {

  nacos {
    serverAddr = "127.0.0.1:8848"
-    namespace = ""
+    namespace = "public"


please reset it.

set namespace "" ?

set namespace "" ?

不要去改动namespace,还原回之前的样子就可以了

l81893521

LGTM

xingfudeshi

I left some comment.please check it.

script/client/spring/application.yml

slievrly · 2020-06-06T07:31:14Z

...iscovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java

@@ -44,12 +43,14 @@
 public class NacosRegistryServiceImpl implements RegistryService<EventListener> {
    private static final String DEFAULT_NAMESPACE = "";
    private static final String DEFAULT_CLUSTER = "default";
+    private static final String DEFAULT_GROUP = "SEATA_GROUP";


DEFAULT_GROUP

high and low version compatibility needs to be considered

set default value is DEFAULT_GROUP?

set default value is DEFAULT_GROUP?

yes,backward compatible

l81893521

And please fix the conflict.

xingfudeshi

LGTM.

slievrly

LGTM

hsoftxl and others added 3 commits April 27, 2020 11:54

发现TC服务支持配置Group

d038b85

发现TC服务支持配置Group

17e9479

Merge branch 'develop' into group

a8765cd

l81893521 added the first-time contributor first-time contributor label Apr 27, 2020

l81893521 changed the title ~~发现TC服务支持配置Group~~ feature: support group configuration in nacos registry Apr 27, 2020

hsoftxl changed the title ~~feature: support group configuration in nacos registry~~ support TC service configuration By Group in nacos Apr 27, 2020

hsoftxl changed the title ~~support TC service configuration By Group in nacos~~ support TC service configuration By group property in nacos type Apr 27, 2020

hsoftxl changed the title ~~support TC service configuration By group property in nacos type~~ support group configuration in nacos registry Apr 27, 2020

hsoftxl and others added 8 commits April 27, 2020 14:23

发现TC服务支持配置Group

45f6cf9

fix unable to register nacos (#2598)

ad76b39

bugfix: nacos-script adapt to nacos 1.2 on permission control. (#2610)

f113802

发现TC服务支持配置Group

d2d74f3

发现TC服务支持配置Group

98ffc60

发现TC服务支持配置Group

ebc6b0e

发现TC服务支持配置Group

392e7ce

Merge branch 'develop' into group

eb6a263

Merge branch 'develop' into group

46eee1a

jsbxyyx changed the title ~~support group configuration in nacos registry~~ feature: support group configuration in nacos registry Apr 27, 2020

hsoftxl and others added 4 commits April 28, 2020 09:37

发现TC服务支持配置Group

667ec70

发现TC服务支持配置Group

b007f3e

Merge branch 'develop' into group

2d56b5b

发现TC服务支持配置Group

f747719

zjinlei added this to the 1.3.0 milestone May 2, 2020

zjinlei and others added 2 commits May 2, 2020 19:09

Merge branch 'develop' into group

c5873bd

Merge branch 'develop' into group

8acd2b6

zjinlei and others added 2 commits May 12, 2020 16:20

Merge branch 'develop' into group

f64ecfa

Merge branch 'develop' into group

ed99f6b

l81893521 added module/discovery discovery module module/seata-spring-boot-starter seata-spring-boot-starter module labels May 20, 2020

hsoftxl and others added 2 commits May 25, 2020 13:56

Merge branch 'develop' into group

72e039d

registry group value

a536200

l81893521 reviewed May 25, 2020

View reviewed changes

l81893521 and others added 3 commits May 27, 2020 10:25

Merge branch 'develop' into group

d69f320

Merge branch 'develop' into group

867b515

registry group value

471b7ae

l81893521 approved these changes May 29, 2020

View reviewed changes

xingfudeshi reviewed Jun 5, 2020

View reviewed changes

script/client/spring/application.yml Show resolved Hide resolved

xingfudeshi and others added 2 commits June 5, 2020 08:41

Merge branch 'develop' into group

9b6a515

Merge branch 'develop' into group

43845bd

slievrly reviewed Jun 6, 2020

View reviewed changes

slievrly and others added 2 commits June 15, 2020 14:17

Merge branch 'develop' into group

4ac0ec1

Merge branch 'develop' into group

95a7a4c

l81893521 reviewed Jun 24, 2020

View reviewed changes

slievrly added the status: waiting-for-feedback Waiting for feedback label Jun 25, 2020

hsoftxl and others added 2 commits June 28, 2020 17:36

Merge branch 'develop' into group

687fc75

compatible lower version

04e95a9

xingfudeshi approved these changes Jun 28, 2020

View reviewed changes

slievrly removed the status: waiting-for-feedback Waiting for feedback label Jun 29, 2020

slievrly approved these changes Jun 29, 2020

View reviewed changes

slievrly merged commit b2738d0 into apache:develop Jun 29, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature: support group configuration in nacos registry #2620

feature: support group configuration in nacos registry #2620

hsoftxl commented Apr 27, 2020

codecov-io commented Apr 27, 2020 •

edited

funky-eyes commented Apr 27, 2020

l81893521 commented Apr 27, 2020

funky-eyes commented Apr 27, 2020

l81893521 commented Apr 27, 2020

codecov-commenter commented May 20, 2020 •

edited

funky-eyes commented May 21, 2020 •

edited

funky-eyes commented May 21, 2020

hsoftxl commented May 25, 2020

l81893521 May 25, 2020

l81893521 May 25, 2020

hsoftxl May 29, 2020

funky-eyes May 29, 2020

l81893521 left a comment

xingfudeshi left a comment

slievrly Jun 6, 2020

slievrly Jun 6, 2020

hsoftxl Jun 15, 2020

funky-eyes Jun 23, 2020

l81893521 left a comment

xingfudeshi left a comment

slievrly left a comment

feature: support group configuration in nacos registry #2620

feature: support group configuration in nacos registry #2620

Conversation

hsoftxl commented Apr 27, 2020

codecov-io commented Apr 27, 2020 • edited

Codecov Report

funky-eyes commented Apr 27, 2020

l81893521 commented Apr 27, 2020

funky-eyes commented Apr 27, 2020

l81893521 commented Apr 27, 2020

codecov-commenter commented May 20, 2020 • edited

Codecov Report

funky-eyes commented May 21, 2020 • edited

funky-eyes commented May 21, 2020

hsoftxl commented May 25, 2020

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

l81893521 left a comment

Choose a reason for hiding this comment

xingfudeshi left a 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

l81893521 left a comment

Choose a reason for hiding this comment

xingfudeshi left a comment

Choose a reason for hiding this comment

slievrly left a comment

Choose a reason for hiding this comment

codecov-io commented Apr 27, 2020 •

edited

codecov-commenter commented May 20, 2020 •

edited

funky-eyes commented May 21, 2020 •

edited