fix(naming): Fix the empty cluster name parameter handling logic to ensure the v3 HTTP processing logic is consistent with gRPC. by iggzq · Pull Request #14674 · alibaba/nacos

iggzq · 2026-03-20T08:01:26Z

在CatalogServiceV2Impl中添加对空集群名的验证，当clusterName为空时，不添加此筛选逻辑，与gRPC保持一致
更新listInstances方法中的集群名验证逻辑，使用actualCluster变量处理空字符串情况
移除InstanceListForm中将空集群名转换为默认集群名的逻辑
为GrpcConnection类的sendRequestNoAck方法添加@OverRide注解
为NacosTpsControlManager接口实现类添加缺失的@OverRide注解
更新相关测试用例以验证空集群名参数的正确处理行为

What is the purpose of the change

fix(#14650) : the Nacos v3 API is inconsistent with the gRPC client mechanism.

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
Run mvn -B clean package apache-rat:check spotbugs:check -DskipTests to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

@OverRide

- 在CatalogServiceV2Impl中添加对空集群名的验证，当clusterName为空时，不添加此筛选逻辑，与gRPC保持一致 - 更新listInstances方法中的集群名验证逻辑，使用actualCluster变量处理空字符串情况 - 移除InstanceListForm中将空集群名转换为默认集群名的逻辑 - 为GrpcConnection类的sendRequestNoAck方法添加@OverRide注解 - 为NacosTpsControlManager接口实现类添加缺失的@OverRide注解 - 更新相关测试用例以验证空集群名参数的正确处理行为

github-actions · 2026-03-20T08:01:53Z

Thanks for your this PR. 🙏
Please check again for your PR changes whether contains any usage/api/configuration change such as Add new API , Add new configuration, Change default value of configuration.
If so, please add or update documents(markdown type) in docs/next/ for repository nacos-group/nacos-group.github.io

感谢您提交的PR。 🙏
请再次查看您的PR内容，确认是否包含任何使用方式/API/配置参数的变更，如：新增API、新增配置参数、修改默认配置等操作。
如果是，请确保在提交之前，在仓库nacos-group/nacos-group.github.io中的docs/next/目录下添加或更新文档（markdown格式）。

KomachiSion

pr标题请使用英文。

- 删除了 InstanceListForm 中未使用的 UtilsAndCommons 导入 - 保持代码整洁性并减少不必要的依赖引入

iggzq · 2026-03-20T17:36:24Z

pr标题请使用英文。
已改变。并且已修复checkstyle问题

- 将通配符导入替换为具体的JUnit断言方法导入 - 明确导入assertEquals、assertFalse、assertNotNull、assertTrue和assertThrows方法 - 提高代码可读性和维护性 - 遵循最佳实践减少不必要的导入依赖

- 删除了对 clusterName 的冗余验证逻辑 - 保留了实际集群名称的必要验证 - 简化了服务实例选择流程中的条件判断

- 将 listInstances 方法调用中的第四个参数从 anyString() 修改为 any() - 保持其他参数匹配器不变 - 确保测试方法 getInstanceList 的功能正常运行

KomachiSion · 2026-03-23T01:50:15Z

修改之后是否会影响到控制台的展示逻辑？能否帮忙测试一下？

codecov-commenter · 2026-03-24T01:43:52Z

Codecov Report

❌ Patch coverage is 60.00000% with 2 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
...lient/naming/NacosNamingMaintainerServiceImpl.java	0.00%	1 Missing and 1 partial ⚠️

📢 Thoughts on this report? Let us know!

KomachiSion · 2026-03-24T01:48:04Z

Thanks for your this PR. 🙏 Please check again for your PR changes whether contains any usage/api/configuration change such as Add new API , Add new configuration, Change default value of configuration. If so, please add or update documents(markdown type) in docs/next/ for repository nacos-group/nacos-group.github.io

感谢您提交的PR。 🙏 请再次查看您的PR内容，确认是否包含任何使用方式/API/配置参数的变更，如：新增API、新增配置参数、修改默认配置等操作。如果是，请确保在提交之前，在仓库nacos-group/nacos-group.github.io中的docs/next/目录下添加或更新文档（markdown格式）。

@iggzq 根据review，控制台的访问应该不受影响，但是如果用户在使用maintainer-client进行访问或者直接调用api会有行为不同的影响，需要你更新一下文档进行说明。

文档需改的PR提交无问题后再合并此PR

wuyfee · 2026-03-24T02:18:26Z

$\color{red}{FAILURE}$
DETAILS
✅ - docker: success
❌ - deploy (standalone & cluster & standalone_auth): failure
❌ - e2e-java-test (standalone & cluster & standalone_auth): skipped
❌ - e2e-go-test (standalone & cluster): skipped
❌ - e2e-cpp-test (standalone & cluster): skipped
❌ - e2e-csharp-test (standalone & cluster): skipped
❌ - e2e-nodejs-test (standalone & cluster): skipped
❌ - e2e-python-test (standalone & cluster): skipped
✅ - clean (standalone & cluster & standalone_auth): success

iggzq · 2026-03-24T09:12:46Z

Thanks for your this PR. 🙏 Please check again for your PR changes whether contains any usage/api/configuration change such as Add new API , Add new configuration, Change default value of configuration. If so, please add or update documents(markdown type) in docs/next/ for repository nacos-group/nacos-group.github.io
感谢您提交的PR。 🙏 请再次查看您的PR内容，确认是否包含任何使用方式/API/配置参数的变更，如：新增API、新增配置参数、修改默认配置等操作。如果是，请确保在提交之前，在仓库nacos-group/nacos-group.github.io中的docs/next/目录下添加或更新文档（markdown格式）。

@iggzq 根据review，控制台的访问应该不受影响，但是如果用户在使用maintainer-client进行访问或者直接调用api会有行为不同的影响，需要你更新一下文档进行说明。

文档需改的PR提交无问题后再合并此PR

ok，晚上我改一下

- 为 listInstances 方法添加带有 clusterName 参数的测试用例

iggzq · 2026-03-25T03:54:30Z

Thanks for your this PR. 🙏 Please check again for your PR changes whether contains any usage/api/configuration change such as Add new API , Add new configuration, Change default value of configuration. If so, please add or update documents(markdown type) in docs/next/ for repository nacos-group/nacos-group.github.io
感谢您提交的PR。 🙏 请再次查看您的PR内容，确认是否包含任何使用方式/API/配置参数的变更，如：新增API、新增配置参数、修改默认配置等操作。如果是，请确保在提交之前，在仓库nacos-group/nacos-group.github.io中的docs/next/目录下添加或更新文档（markdown格式）。

@iggzq 根据review，控制台的访问应该不受影响，但是如果用户在使用maintainer-client进行访问或者直接调用api会有行为不同的影响，需要你更新一下文档进行说明。

文档需改的PR提交无问题后再合并此PR

已在nacos-group/nacos-group.github.io中修改文档

wuyfee · 2026-03-25T06:20:44Z

$\color{red}{FAILURE}$
DETAILS
✅ - docker: success
❌ - deploy (standalone & cluster & standalone_auth): failure
❌ - e2e-java-test (standalone & cluster & standalone_auth): skipped
❌ - e2e-go-test (standalone & cluster): skipped
❌ - e2e-cpp-test (standalone & cluster): skipped
❌ - e2e-csharp-test (standalone & cluster): skipped
❌ - e2e-nodejs-test (standalone & cluster): skipped
❌ - e2e-python-test (standalone & cluster): skipped
✅ - clean (standalone & cluster & standalone_auth): success

springcloudconf · 2026-03-25T09:12:53Z

你们是谁啊，不要再给我发邮件了，好吗坏坏的对你笑 ***@***.*** 原始邮件发件人：Same ***@***.***> 发件时间：2026年3月25日 10:16 收件人：alibaba/nacos ***@***.***> 抄送：Subscribed ***@***.***> 主题：Re: [alibaba/nacos] fix(naming): Fix the empty cluster name parameter handling logic to ensure the v3 HTTP processing logic is consistent with gRPC. (PR #14674) @Sarahbella4040 approved this pull request. — Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you are subscribed to this thread.

KomachiSion · 2026-03-31T08:57:24Z

@iggzq 文档已经reivew，有修改意见麻烦更新一下。

KomachiSion · 2026-04-02T02:20:54Z

naming/src/main/java/com/alibaba/nacos/naming/core/CatalogServiceV2Impl.java

        }
-        if (!serviceStorage.getClusters(service).contains(clusterName)) {
-            throw new NacosException(NacosException.NOT_FOUND, "cluster " + clusterName + " is not found!");
+        String actualCluster = StringUtils.isBlank(clusterName) ? StringUtils.EMPTY : clusterName;


这一行看起来是多余的。因为下面有校验是否为blank

KomachiSion · 2026-04-02T02:22:31Z

@iggzq 给了一点新的评论：

同时建议同步一下develop分支， develop分支优化了一下ci的稳定性。文档的冲突也解决一下。

KomachiSion requested changes Mar 20, 2026

View reviewed changes

KomachiSion previously approved these changes Mar 20, 2026

View reviewed changes

KomachiSion self-requested a review March 20, 2026 09:34

iggzq changed the title ~~fix(naming): 修复空集群名参数处理逻辑,使得v3 http的处理逻辑与gRPC保持一致~~ fix(naming): Fix the empty cluster name parameter handling logic to ensure the v3 HTTP processing logic is consistent with gRPC. Mar 20, 2026

refactor(naming): 移除未使用的导入

447a5bc

- 删除了 InstanceListForm 中未使用的 UtilsAndCommons 导入 - 保持代码整洁性并减少不必要的依赖引入

iggzq dismissed KomachiSion’s stale review via 447a5bc March 20, 2026 17:32

iggzq added 3 commits March 21, 2026 11:00

fix(naming): 移除重复的集群存在性检查

efb8b41

- 删除了对 clusterName 的冗余验证逻辑 - 保留了实际集群名称的必要验证 - 简化了服务实例选择流程中的条件判断

refactor(test): 调整实例控制器测试中的参数匹配器

471c2e8

- 将 listInstances 方法调用中的第四个参数从 anyString() 修改为 any() - 保持其他参数匹配器不变 - 确保测试方法 getInstanceList 的功能正常运行

test(naming): 添加集群名称参数的实例列表测试用例

c8500e5

- 为 listInstances 方法添加带有 clusterName 参数的测试用例

iggzq mentioned this pull request Mar 24, 2026

docs(api): Update clusterName parameter description in API documentation nacos-group/nacos-group.github.io#1055

Open

6 tasks

Sarahbella4040 approved these changes Mar 25, 2026

View reviewed changes

KomachiSion approved these changes Mar 25, 2026

View reviewed changes

KomachiSion requested changes Apr 2, 2026

View reviewed changes

KomachiSion mentioned this pull request Apr 2, 2026

fix(naming): do not force clusterName to DEFAULT in v3 HTTP API #14778

Open

Conversation

iggzq commented Mar 20, 2026

What is the purpose of the change

Brief changelog

Verifying this change

Uh oh!

github-actions bot commented Mar 20, 2026

Uh oh!

KomachiSion left a comment

Choose a reason for hiding this comment

Uh oh!

iggzq commented Mar 20, 2026

Uh oh!

KomachiSion commented Mar 23, 2026

Uh oh!

codecov-commenter commented Mar 24, 2026

Codecov Report

Uh oh!

KomachiSion commented Mar 24, 2026

Uh oh!

wuyfee commented Mar 24, 2026

Uh oh!

iggzq commented Mar 24, 2026

Uh oh!

iggzq commented Mar 25, 2026

Uh oh!

wuyfee commented Mar 25, 2026

Uh oh!

springcloudconf commented Mar 25, 2026 via email

Uh oh!

KomachiSion commented Mar 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

KomachiSion Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

KomachiSion commented Apr 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

KomachiSion commented Mar 31, 2026 •

edited

Loading