feat: support dual-discovery

fishtailfu · fishtailfu · commit 20e4dbc50801 · 2025-08-18T21:12:54.000+08:00
diff --git a/polaris-plugins/polaris-plugins-connector/connector-composite/src/main/java/com/tencent/polaris/plugins/connector/composite/CompositeServiceUpdateTask.java b/polaris-plugins/polaris-plugins-connector/connector-composite/src/main/java/com/tencent/polaris/plugins/connector/composite/CompositeServiceUpdateTask.java
@@ -85,6 +85,7 @@ public class CompositeServiceUpdateTask extends ServiceUpdateTask {
     public CompositeServiceUpdateTask(ServiceEventHandler handler, DestroyableServerConnector connector) {
         super(handler, connector);
         CompositeConnector compositeConnector = (CompositeConnector) connector;
+        EventType eventType = handler.getServiceEventKey().getEventType();
         for (DestroyableServerConnector sc : compositeConnector.getServerConnectors()) {
             if (SERVER_CONNECTOR_GRPC.equals(sc.getName()) && sc.isDiscoveryEnable()) {
                 subServiceUpdateTaskMap.put(SERVER_CONNECTOR_GRPC, new GrpcServiceUpdateTask(serviceEventHandler, sc));
@@ -98,7 +99,9 @@ public CompositeServiceUpdateTask(ServiceEventHandler handler, DestroyableServer
                     ifMainConnectorTypeSet = true;
                 }
             }
-            if (SERVER_CONNECTOR_NACOS.equals(sc.getName()) && sc.isDiscoveryEnable()) {
+            // nacos仅支持服务事件和实例事件
+            if (SERVER_CONNECTOR_NACOS.equals(sc.getName()) && sc.isDiscoveryEnable()
+                    && (eventType == EventType.INSTANCE || eventType == EventType.SERVICE)) {
                 subServiceUpdateTaskMap.put(SERVER_CONNECTOR_NACOS, new NacosServiceUpdateTask(serviceEventHandler, sc));
                 if (!ifMainConnectorTypeSet) {
                     mainConnectorType = sc.getName();
diff --git a/polaris-plugins/polaris-plugins-connector/connector-nacos/src/main/java/com/tencent/polaris/plugins/connector/nacos/NacosService.java b/polaris-plugins/polaris-plugins-connector/connector-nacos/src/main/java/com/tencent/polaris/plugins/connector/nacos/NacosService.java
@@ -21,7 +21,6 @@
 
 package com.tencent.polaris.plugins.connector.nacos;
 
-import static com.tencent.polaris.api.config.plugin.DefaultPlugins.SERVER_CONNECTOR_CONSUL;
 import static com.tencent.polaris.api.config.plugin.DefaultPlugins.SERVER_CONNECTOR_NACOS;
 import static com.tencent.polaris.plugins.connector.common.constant.ConnectorConstant.SERVER_CONNECTOR_TYPE;
 
@@ -41,8 +40,6 @@
 import com.tencent.polaris.api.exception.ServerCodes;
 import com.tencent.polaris.api.exception.ServerErrorResponseException;
 import com.tencent.polaris.api.plugin.server.ServerEvent;
-import com.tencent.polaris.api.pojo.ServiceInfo;
-import com.tencent.polaris.api.pojo.Services;
 import com.tencent.polaris.api.utils.CollectionUtils;
 import com.tencent.polaris.api.utils.StringUtils;
 import com.tencent.polaris.api.utils.ThreadPoolUtils;
@@ -51,10 +48,8 @@
 import com.tencent.polaris.plugins.connector.common.ServiceUpdateTask;
 import com.tencent.polaris.specification.api.v1.service.manage.ResponseProto;
 import com.tencent.polaris.specification.api.v1.service.manage.ServiceProto;
-import com.tencent.polaris.specification.api.v1.service.manage.ServiceProto.Service;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -67,7 +62,7 @@ public class NacosService extends Destroyable {
 
     private static final Logger LOG = LoggerFactory.getLogger(NacosService.class);
 
-    private NamingService namingService;
+    private final NamingService namingService;
 
     private NacosContext nacosContext;
 
@@ -83,7 +78,22 @@ public NacosService(NamingService namingService, NacosContext nacosContext) {
     }
 
 
-    public void doInstanceSubscribe(ServiceUpdateTask serviceUpdateTask) {
+    public void sendInstanceRequest(ServiceUpdateTask serviceUpdateTask) {
+
+        refreshExecutor.submit(() -> {
+            try {
+                asyncGetInstances(serviceUpdateTask);
+            } catch (Exception e) {
+                LOG.error("Get nacos service instances of {} failed. ",
+                        serviceUpdateTask.getServiceEventKey().getService(), e);
+                throw new RuntimeException(e);
+            }
+        });
+
+    }
+
+    public void asyncGetInstances(ServiceUpdateTask serviceUpdateTask) {
+
         // 通过namingService订阅服务监听，当服务有变化时，回调serviceListener，将结果notify给polaris
         EventListener serviceListener = event -> {
             try {
@@ -154,7 +164,7 @@ public void doInstanceSubscribe(ServiceUpdateTask serviceUpdateTask) {
                         String.format("Get service instances of %s sync failed.",
                                 serviceUpdateTask.getServiceEventKey().getServiceKey()));
                 ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), null, error,
-                        SERVER_CONNECTOR_CONSUL);
+                        SERVER_CONNECTOR_NACOS);
                 serviceUpdateTask.notifyServerEvent(serverEvent);
                 serviceUpdateTask.retry();
             }
@@ -233,7 +243,7 @@ private void syncGetService(ServiceUpdateTask serviceUpdateTask) {
             newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
 
             ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(),
-                    newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
+                    newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_NACOS);
             boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
 
             if (!svcDeleted) {
diff --git a/polaris-plugins/polaris-plugins-connector/connector-nacos/src/main/java/com/tencent/polaris/plugins/connector/nacos/NacosServiceUpdateTask.java b/polaris-plugins/polaris-plugins-connector/connector-nacos/src/main/java/com/tencent/polaris/plugins/connector/nacos/NacosServiceUpdateTask.java
@@ -17,7 +17,6 @@
 
 package com.tencent.polaris.plugins.connector.nacos;
 
-import com.alibaba.nacos.api.naming.NamingService;
 import com.tencent.polaris.api.plugin.server.ServerEvent;
 import com.tencent.polaris.api.plugin.server.ServiceEventHandler;
 import com.tencent.polaris.api.pojo.ServiceEventKey.EventType;
@@ -63,7 +62,7 @@ public void execute(ServiceUpdateTask serviceUpdateTask) {
             if (serviceUpdateTask.getServiceEventKey().getEventType() == EventType.SERVICE) {
                 nacosService.sendServiceRequest(serviceUpdateTask);
             } else if (serviceUpdateTask.getServiceEventKey().getEventType() == EventType.INSTANCE) {
-                nacosService.doInstanceSubscribe(serviceUpdateTask);
+                nacosService.sendInstanceRequest(serviceUpdateTask);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`
`18`	`18`	`package com.tencent.polaris.plugins.connector.nacos;`
`19`	`19`
`20`		`-import com.alibaba.nacos.api.naming.NamingService;`
`21`	`20`	`import com.tencent.polaris.api.plugin.server.ServerEvent;`
`22`	`21`	`import com.tencent.polaris.api.plugin.server.ServiceEventHandler;`
`23`	`22`	`import com.tencent.polaris.api.pojo.ServiceEventKey.EventType;`
`@@ -63,7 +62,7 @@ public void execute(ServiceUpdateTask serviceUpdateTask) {`
`63`	`62`	`if (serviceUpdateTask.getServiceEventKey().getEventType() == EventType.SERVICE) {`
`64`	`63`	`nacosService.sendServiceRequest(serviceUpdateTask);`
`65`	`64`	`} else if (serviceUpdateTask.getServiceEventKey().getEventType() == EventType.INSTANCE) {`
`66`		`- nacosService.doInstanceSubscribe(serviceUpdateTask);`
	`65`	`+ nacosService.sendInstanceRequest(serviceUpdateTask);`
`67`	`66`	`}`
`68`	`67`	`}`
`69`	`68`	`}`