bugfix: the bug where multiple nodes cannot be retrieved from the naming server #6757

funky-eyes · 2024-08-15T07:18:51Z

I have registered the PR changes.

Ⅰ. 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

# Conflicts: # changes/en-us/2.x.md # changes/zh-cn/2.x.md

# Conflicts: # changes/zh-cn/2.x.md

# Conflicts: # common/src/main/java/org/apache/seata/common/metadata/namingserver/Instance.java # common/src/main/java/org/apache/seata/common/metadata/namingserver/NamingServerNode.java # namingserver/src/main/java/org/apache/seata/namingserver/controller/NamingController.java # server/src/main/java/org/apache/seata/server/Server.java

…o 0812 # Conflicts: # common/src/main/java/org/apache/seata/common/ConfigurationKeys.java # namingserver/src/main/java/org/apache/seata/namingserver/manager/NamingManager.java

…o 0812

codecov · 2024-08-15T07:34:24Z

Codecov Report

Attention: Patch coverage is 64.22018% with 39 lines in your changes missing coverage. Please review.

Project coverage is 50.56%. Comparing base (fb88638) to head (9bec44e).
Report is 1 commits behind head on 2.x.

Files	Patch %	Lines
...ache/seata/namingserver/manager/NamingManager.java	70.12%	13 Missing and 10 partials ⚠️
...java/org/apache/seata/common/metadata/Cluster.java	0.00%	4 Missing ⚠️
...eata/namingserver/controller/NamingController.java	33.33%	4 Missing ⚠️
.../namingserver/NamingserverRegistryServiceImpl.java	0.00%	3 Missing ⚠️
...ure/properties/server/store/StoreDBProperties.java	25.00%	3 Missing ⚠️
...ver/storage/db/store/VGroupMappingDataBaseDAO.java	0.00%	1 Missing ⚠️
...ge/redis/store/RedisVGroupMappingStoreManager.java	85.71%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##                2.x    #6757      +/-   ##
============================================
+ Coverage     50.52%   50.56%   +0.03%     
- Complexity     5927     5934       +7     
============================================
  Files          1061     1061              
  Lines         37088    37123      +35     
  Branches       4400     4402       +2     
============================================
+ Hits          18738    18770      +32     
+ Misses        16453    16448       -5     
- Partials       1897     1905       +8

Files	Coverage Δ
...ava/org/apache/seata/common/ConfigurationKeys.java	`0.00% <ø> (ø)`
...he/seata/namingserver/entity/pojo/ClusterData.java	`67.79% <100.00%> (+4.63%)`	⬆️
...ver/storage/db/store/VGroupMappingDataBaseDAO.java	`0.00% <0.00%> (ø)`
...ge/redis/store/RedisVGroupMappingStoreManager.java	`75.86% <85.71%> (ø)`
.../namingserver/NamingserverRegistryServiceImpl.java	`0.00% <0.00%> (ø)`
...ure/properties/server/store/StoreDBProperties.java	`27.86% <25.00%> (-0.21%)`	⬇️
...java/org/apache/seata/common/metadata/Cluster.java	`0.00% <0.00%> (ø)`
...eata/namingserver/controller/NamingController.java	`38.88% <33.33%> (ø)`
...ache/seata/namingserver/manager/NamingManager.java	`67.14% <70.12%> (+8.13%)`	⬆️

... and 3 files with indirect coverage changes

jsbxyyx · 2024-08-17T06:01:18Z

common/src/main/java/org/apache/seata/common/metadata/Cluster.java

+    public void appendUnits(List<Unit> unitData) {
+        this.unitData.addAll(unitData);
+    }
+    public void appendUnit(Unit unitData) {


xingfudeshi

LGTM

jsbxyyx · 2024-08-17T06:03:28Z

common/src/main/java/org/apache/seata/common/metadata/Cluster.java

        this.unitData = unitData;
    }

+    public void appendUnits(List<Unit> unitData) {


use Collection

jsbxyyx · 2024-08-17T06:04:13Z

namingserver/src/main/java/org/apache/seata/namingserver/entity/pojo/ClusterData.java

-        if (!StringUtils.hasLength(unitName)) {
-            clusterResponse.setUnitData(new ArrayList<>(unitData.values()));
+        if (CollectionUtils.isEmpty(unitNames)) {
+            clusterResponse.appendUnits(new ArrayList<>(unitData.values()));


if use Collection, not wrap

jsbxyyx

LGTM

…ing server (apache#6757)

ggbocoder and others added 23 commits January 2, 2024 10:47

add signature

50c77dc

Merge remote-tracking branch 'upstream/2.x' into 2.x

b36f5b2

# Conflicts: # changes/en-us/2.x.md # changes/zh-cn/2.x.md

Merge remote-tracking branch 'upstream/2.x' into 2.x

e15537d

# Conflicts: # changes/zh-cn/2.x.md

Merge remote-tracking branch 'upstream/2.x' into 2.x

85398ec

Merge remote-tracking branch 'upstream/2.x' into 2.x

e049125

Merge remote-tracking branch 'upstream/2.x' into 2.x

2939f59

Merge remote-tracking branch 'upstream/2.x' into 2.x

ebeda3a

Merge branch '2.x' of https://github.com/seata/seata into 2.x

f2f9509

Merge branch '2.x' of https://github.com/seata/seata into 2.x

eed8785

Merge branch '2.x' of https://github.com/seata/seata into 2.x

5147f84

Merge branch '2.x' of https://github.com/seata/seata into 2.x

f6f4293

optimize: namingserver transaction group storage structure

86b9385

init

33e681a

merge

c92b5e3

pass ci

5e1ad4f

Merge branch 'fix/fix_namingserver' of github.com:ggbocoder/seata int…

1dbf929

…o 0812 # Conflicts: # common/src/main/java/org/apache/seata/common/ConfigurationKeys.java # namingserver/src/main/java/org/apache/seata/namingserver/manager/NamingManager.java

pass ci

e1d3a2f

Merge branch 'fix/fix_namingserver' of github.com:ggbocoder/seata int…

d54bb21

…o 0812

bugfix

38855d2

bugfix

f042113

opt

a591cb9

opt

2e0a7f3

funky-eyes added type: bug Category issues or prs related to bug. module/server server module module/namingserver labels Aug 15, 2024

funky-eyes added this to the 2.2.0 milestone Aug 15, 2024

code format

b9856d8

opt

dc405b6

funky-eyes added 4 commits August 15, 2024 16:35

fix ut

2e6ae3e

fix ut

75a41f4

fix ut

71d4665

code format

666dc2b

funky-eyes requested a review from l81893521 August 15, 2024 11:44

funky-eyes added 4 commits August 15, 2024 20:23

add ut

fb430e2

add ut

be87170

optimize

41942d1

optimize

c0e14e7

jsbxyyx reviewed Aug 17, 2024

View reviewed changes

xingfudeshi approved these changes Aug 17, 2024

View reviewed changes

jsbxyyx reviewed Aug 17, 2024

View reviewed changes

optimize

9bec44e

jsbxyyx approved these changes Aug 17, 2024

View reviewed changes

funky-eyes merged commit f7c3866 into apache:2.x Aug 17, 2024

YvCeung pushed a commit to YvCeung/incubator-seata that referenced this pull request Dec 25, 2025

bugfix: the bug where multiple nodes cannot be retrieved from the nam…

ae94576

…ing server (apache#6757)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

bugfix: the bug where multiple nodes cannot be retrieved from the naming server #6757

bugfix: the bug where multiple nodes cannot be retrieved from the naming server #6757

Uh oh!

funky-eyes commented Aug 15, 2024

Uh oh!

codecov bot commented Aug 15, 2024 •

edited

Loading

Uh oh!

jsbxyyx Aug 17, 2024

Uh oh!

funky-eyes Aug 17, 2024

Uh oh!

xingfudeshi left a comment

Uh oh!

jsbxyyx Aug 17, 2024

Uh oh!

funky-eyes Aug 17, 2024

Uh oh!

jsbxyyx Aug 17, 2024 •

edited

Loading

Uh oh!

funky-eyes Aug 17, 2024

Uh oh!

jsbxyyx left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bugfix: the bug where multiple nodes cannot be retrieved from the naming server #6757

bugfix: the bug where multiple nodes cannot be retrieved from the naming server #6757

Uh oh!

Conversation

funky-eyes commented Aug 15, 2024

Ⅰ. 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

Uh oh!

codecov bot commented Aug 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

jsbxyyx Aug 17, 2024

Choose a reason for hiding this comment

Uh oh!

funky-eyes Aug 17, 2024

Choose a reason for hiding this comment

Uh oh!

xingfudeshi left a comment

Choose a reason for hiding this comment

Uh oh!

jsbxyyx Aug 17, 2024

Choose a reason for hiding this comment

Uh oh!

funky-eyes Aug 17, 2024

Choose a reason for hiding this comment

Uh oh!

jsbxyyx Aug 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

funky-eyes Aug 17, 2024

Choose a reason for hiding this comment

Uh oh!

jsbxyyx left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Aug 15, 2024 •

edited

Loading

jsbxyyx Aug 17, 2024 •

edited

Loading