modify dubbo plugin configuration based on selector #5953

Wweiei · 2025-03-07T08:49:56Z

complete task 4 in #5923 , modify dubbo registry config base on selector.

Make sure that:

You have read the contribution guidelines.
You submit test cases (unit or integration tests) that back your changes.
Your local test passed ./mvnw clean install -Dmaven.javadoc.skip=true.

...-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/cache/ApacheDubboConfigCache.java

…ector' into feature/dubbo-config-base-on-selector

Aias00 · 2025-03-20T03:03:59Z

@Wweiei if u got time, fix the conflicts

…g-base-on-selector # Conflicts: # db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql # db/upgrade/2.7.0-upgrade-2.7.1-ob.sql # db/upgrade/2.7.0-upgrade-2.7.1-og.sql # db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql # db/upgrade/2.7.0-upgrade-2.7.1-pg.sql

Wweiei · 2025-03-20T03:46:20Z

@Wweiei if u got time, fix the conflicts
ok, i have fixed it

Aias00 · 2025-03-27T01:55:29Z

@Wweiei hi, fix the ci, pls

…g-base-on-selector # Conflicts: # db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql # db/upgrade/2.7.0-upgrade-2.7.1-ob.sql # db/upgrade/2.7.0-upgrade-2.7.1-og.sql # db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql # db/upgrade/2.7.0-upgrade-2.7.1-pg.sql

Aias00 · 2025-04-10T12:08:53Z

@Wweiei fix ci pls

…g-base-on-selector # Conflicts: # db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql # db/upgrade/2.7.0-upgrade-2.7.1-ob.sql # db/upgrade/2.7.0-upgrade-2.7.1-og.sql # db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql # db/upgrade/2.7.0-upgrade-2.7.1-pg.sql

moremind · 2025-04-15T15:06:47Z

shenyu-admin/src/main/resources/application.yml

@@ -21,7 +21,7 @@ spring:
  application:
    name: shenyu-admin
  profiles:
-    active: h2
+    active: mysql


not change this configuration

moremind · 2025-04-15T15:07:02Z

shenyu-common/src/main/java/org/apache/shenyu/common/constant/Constants.java

+    /**
+     * The constant string separator.
+     */
+    String SEPARATOR_UNDERLINE = "_";


this is existed

moremind · 2025-04-15T15:07:16Z

...henyu-examples-dubbo/shenyu-examples-apache-dubbo-service/src/main/resources/application.yml

-    address: zookeeper://localhost:2181
-
+    address: nacos://127.0.0.1:8849?namespace=namespace1
+#    address: zookeeper://localhost:2181


why change this?

moremind · 2025-04-15T15:07:24Z

...henyu-examples-dubbo/shenyu-examples-apache-dubbo-service/src/main/resources/application.yml

-
+    address: nacos://127.0.0.1:8849?namespace=namespace1
+#    address: zookeeper://localhost:2181
+
 shenyu:


not add this

moremind · 2025-04-15T15:08:33Z

...-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/cache/ApacheDubboConfigCache.java

+        }
+
+        ReferenceConfig<GenericService> reference = new ReferenceConfig<>();
+        reference.setGeneric("true");


why "true"? not true?

moremind · 2025-04-15T15:09:06Z

...-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/cache/ApacheDubboConfigCache.java

+        Optional.ofNullable(dubboUpstream.getVersion()).ifPresent(registryConfigTemp::setVersion);
+        if (StringUtils.isNotBlank(namespace)) {
+            if (!registryConfigTemp.getAddress().contains(Constants.NAMESPACE)) {
+                registryConfigTemp.setAddress(registryConfigTemp.getAddress() + "?" + Constants.NAMESPACE + "=" + namespace);


use common method!

moremind · 2025-04-15T15:10:49Z

...dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyService.java

+                : dubboUpstreams.stream().filter(u -> u.isStatus() && StringUtils.isNotBlank(u.getRegistry())).collect(Collectors.toList());
+        // if dubboUpstreams is empty, use default plugin config
+        if (CollectionUtils.isEmpty(dubboUpstreams)) {
+            referenceKey = StringUtils.isNotBlank(namespace) ? namespace + ":" + referenceKey : referenceKey;


add common variable

moremind · 2025-04-15T15:11:15Z

...dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyService.java

+        List<Upstream> upstreams = this.convertUpstreamList(dubboUpstreams);
+        String ip = Objects.requireNonNull(exchange.getRequest().getRemoteAddress()).getAddress().getHostAddress();
+        Upstream upstream = LoadBalancerFactory.selector(upstreams, LoadBalanceEnum.RANDOM.getName(), ip);
+        DubboUpstream dubboUpstream = null;


Copilot

Copilot reviewed 12 out of 22 changed files in this pull request and generated 1 comment.

Files not reviewed (10)

db/init/mysql/schema.sql: Language not supported
db/init/ob/schema.sql: Language not supported
db/init/og/create-table.sql: Language not supported
db/init/oracle/schema.sql: Language not supported
db/init/pg/create-table.sql: Language not supported
db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql: Language not supported
db/upgrade/2.7.0-upgrade-2.7.1-ob.sql: Language not supported
db/upgrade/2.7.0-upgrade-2.7.1-og.sql: Language not supported
db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql: Language not supported
db/upgrade/2.7.0-upgrade-2.7.1-pg.sql: Language not supported

Copilot · 2025-04-15T15:14:46Z

...dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyService.java

+        Upstream upstream = LoadBalancerFactory.selector(upstreams, LoadBalanceEnum.RANDOM.getName(), ip);
+        DubboUpstream dubboUpstream = null;
+        for (DubboUpstream upstreamItem : dubboUpstreams) {
+            if (Objects.equals(upstreamItem.getRegistry(), upstreamItem.getRegistry())


Self-comparison of 'upstreamItem.getRegistry()' is detected. It is likely intended to compare 'upstreamItem.getRegistry()' with 'upstream.getRegistry()'.

Suggested change

if (Objects.equals(upstreamItem.getRegistry(), upstreamItem.getRegistry())

if (Objects.equals(upstreamItem.getRegistry(), upstream.getRegistry())

Wweiei and others added 2 commits March 7, 2025 16:42

modify dubbo plugin configuration based on selector

2386802

Merge branch 'master' into feature/dubbo-config-base-on-selector

2b086a0

moremind requested changes Mar 10, 2025

View reviewed changes

Aias00 and others added 8 commits March 10, 2025 13:44

Merge branch 'master' into feature/dubbo-config-base-on-selector

9329331

Merge branch 'master' into feature/dubbo-config-base-on-selector

c1dd660

code optimization，change some magic value in ApacheDubboConfigCache

74a8769

Merge remote-tracking branch 'origin/feature/dubbo-config-base-on-sel…

f3eedb3

…ector' into feature/dubbo-config-base-on-selector

Merge branch 'master' into feature/dubbo-config-base-on-selector

53b3fa2

Merge branch 'master' into feature/dubbo-config-base-on-selector

55475d6

Merge branch 'master' into feature/dubbo-config-base-on-selector

f40aa48

Merge branch 'master' into feature/dubbo-config-base-on-selector

0f4a950

Aias00 added 2 commits March 20, 2025 16:16

Merge branch 'master' into feature/dubbo-config-base-on-selector

d7b1630

Merge branch 'master' into feature/dubbo-config-base-on-selector

8abedd4

Wweiei and others added 2 commits March 28, 2025 09:00

Merge branch 'master' into feature/dubbo-config-base-on-selector

cd8e9ab

Aias00 added this to the 2.7.0.1 milestone Mar 31, 2025

Aias00 mentioned this pull request Mar 31, 2025

[RoadMap] New Plannes for ShenYu 2.7.0.1 #5923

Open

18 tasks

Aias00 added 7 commits March 31, 2025 14:27

Merge branch 'master' into feature/dubbo-config-base-on-selector

df757d3

Merge branch 'master' into feature/dubbo-config-base-on-selector

a8156e2

Merge branch 'master' into feature/dubbo-config-base-on-selector

f5c3d3c

Merge branch 'master' into feature/dubbo-config-base-on-selector

e23b231

Merge branch 'master' into feature/dubbo-config-base-on-selector

14c45b4

Merge branch 'master' into feature/dubbo-config-base-on-selector

143d4a4

Merge branch 'master' into feature/dubbo-config-base-on-selector

7697e3d

Aias00 requested a review from moremind April 10, 2025 12:08

Wweiei and others added 5 commits April 11, 2025 09:44

Merge branch 'master' into feature/dubbo-config-base-on-selector

d6050e8

Merge branch 'master' into feature/dubbo-config-base-on-selector

15e3469

Merge branch 'master' into feature/dubbo-config-base-on-selector

a891a33

Merge branch 'master' into feature/dubbo-config-base-on-selector

b09958d

moremind requested changes Apr 15, 2025

View reviewed changes

moremind added plugin: dubbo plugin: apache-dubbo labels Apr 15, 2025

moremind requested a review from Copilot April 15, 2025 15:14

Copilot AI reviewed Apr 15, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

modify dubbo plugin configuration based on selector #5953

modify dubbo plugin configuration based on selector #5953

Wweiei commented Mar 7, 2025 •

edited

Loading

Aias00 commented Mar 20, 2025

Wweiei commented Mar 20, 2025

Aias00 commented Mar 27, 2025

Aias00 commented Apr 10, 2025

moremind Apr 15, 2025

moremind Apr 15, 2025

moremind Apr 15, 2025

moremind Apr 15, 2025

moremind Apr 15, 2025

moremind Apr 15, 2025

moremind Apr 15, 2025

moremind Apr 15, 2025

Copilot AI left a comment

Copilot AI Apr 15, 2025

	if (Objects.equals(upstreamItem.getRegistry(), upstreamItem.getRegistry())
	if (Objects.equals(upstreamItem.getRegistry(), upstream.getRegistry())

modify dubbo plugin configuration based on selector #5953

Are you sure you want to change the base?

modify dubbo plugin configuration based on selector #5953

Conversation

Wweiei commented Mar 7, 2025 • edited Loading

Aias00 commented Mar 20, 2025

Wweiei commented Mar 20, 2025

Aias00 commented Mar 27, 2025

Aias00 commented Apr 10, 2025

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

Choose a reason for hiding this comment

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot AI Apr 15, 2025

Choose a reason for hiding this comment

Wweiei commented Mar 7, 2025 •

edited

Loading