feat: support dual-discovery

Author: fishtailfu

polaris-plugins/polaris-plugins-connector/connector-common/src/main/java/com/tencent/polaris/plugins/connector/common/constant/NacosConstant.java

@@ -0,0 +1,31 @@
+/*
+ * Tencent is pleased to support the open source community by making polaris-java available.
+ *
+ * Copyright (C) 2021 Tencent. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.polaris.plugins.connector.common.constant;
+
+public interface NacosConstant {
+
+    interface MetadataMapKey {
+        String NACOS_GROUP_KEY = "nacos.group";
+
+        String NACOS_CLUSTER_KEY = "nacos.cluster";
+
+        String NACOS_EPHEMERAL_KEY = "nacos.ephemeral";
+
+        String NACOS_SERVICE_KEY = "nacos.service";
+    }
+}

polaris-plugins/polaris-plugins-connector/connector-composite/pom.xml

@@ -32,5 +32,10 @@
             <artifactId>connector-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.tencent.polaris</groupId>
+            <artifactId>connector-nacos</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

polaris-plugins/polaris-plugins-connector/connector-composite/src/main/java/com/tencent/polaris/plugins/connector/composite/CompositeServiceUpdateTask.java

@@ -42,6 +42,7 @@
 import com.tencent.polaris.plugins.connector.composite.zero.InstanceListMeta;
 import com.tencent.polaris.plugins.connector.consul.ConsulServiceUpdateTask;
 import com.tencent.polaris.plugins.connector.grpc.GrpcServiceUpdateTask;
+import com.tencent.polaris.plugins.connector.nacos.NacosServiceUpdateTask;
 import com.tencent.polaris.specification.api.v1.model.ModelProto;
 import com.tencent.polaris.specification.api.v1.service.manage.ResponseProto.DiscoverResponse;
 import com.tencent.polaris.specification.api.v1.service.manage.ServiceProto.Instance;
@@ -54,6 +55,7 @@
 
 import static com.tencent.polaris.api.config.plugin.DefaultPlugins.SERVER_CONNECTOR_CONSUL;
 import static com.tencent.polaris.api.config.plugin.DefaultPlugins.SERVER_CONNECTOR_GRPC;
+import static com.tencent.polaris.api.config.plugin.DefaultPlugins.SERVER_CONNECTOR_NACOS;
 import static com.tencent.polaris.plugins.connector.common.constant.ConnectorConstant.ORDER_LIST;
 import static com.tencent.polaris.plugins.connector.common.constant.ConnectorConstant.SERVER_CONNECTOR_TYPE;
 
@@ -96,6 +98,13 @@ public CompositeServiceUpdateTask(ServiceEventHandler handler, DestroyableServer
                     ifMainConnectorTypeSet = true;
                 }
             }
+            if (SERVER_CONNECTOR_NACOS.equals(sc.getName()) && sc.isDiscoveryEnable()) {
+                subServiceUpdateTaskMap.put(SERVER_CONNECTOR_NACOS, new NacosServiceUpdateTask(serviceEventHandler, sc));
+                if (!ifMainConnectorTypeSet) {
+                    mainConnectorType = sc.getName();
+                    ifMainConnectorTypeSet = true;
+                }
+            }
         }
     }
 

polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulAPIConnector.java

@@ -89,7 +89,7 @@ public class ConsulAPIConnector extends DestroyableServerConnector {
      */
     private boolean initialized = false;
 
-    private boolean ieRegistered = false;
+    private boolean isRegistered = false;
 
     private String id;
     private boolean isRegisterEnable = true;
@@ -294,7 +294,7 @@ public void deRegisterServiceHandler(ServiceEventKey eventKey) throws PolarisExc
     @Override
     public CommonProviderResponse registerInstance(CommonProviderRequest req, Map<String, String> customHeader)
             throws PolarisException {
-        if (isRegisterEnable() && !ieRegistered) {
+        if (isRegisterEnable() && !isRegistered) {
             ServiceKey serviceKey = new ServiceKey(req.getNamespace(), req.getService());
             try {
                 LOG.info("Registering service to Consul");
@@ -327,7 +327,7 @@ public CommonProviderResponse registerInstance(CommonProviderRequest req, Map<St
                 resp.setInstanceID(service.getId());
                 resp.setExists(false);
                 LOG.info("Registered service to Consul: " + service);
-                ieRegistered = true;
+                isRegistered = true;
                 // heartbeat when registration is successful.
                 heartbeat(req);
                 return resp;
@@ -399,13 +399,13 @@ private NewService buildRegisterInstanceRequest(CommonProviderRequest req) {
 
     @Override
     public void deregisterInstance(CommonProviderRequest req) throws PolarisException {
-        if (ieRegistered) {
+        if (isRegistered) {
             ServiceKey serviceKey = new ServiceKey(req.getNamespace(), req.getService());
             try {
                 LOG.info("Unregistering service to Consul: " + consulContext.getInstanceId());
                 this.consulClient.agentServiceDeregister(consulContext.getInstanceId(), consulContext.getAclToken());
                 LOG.info("Unregistered service to Consul: " + consulContext.getInstanceId());
-                ieRegistered = false;
+                isRegistered = false;
             } catch (ConsulException e) {
                 throw new RetriableException(ErrorCode.NETWORK_ERROR,
                         String.format("fail to deregister host %s:%d service %s", req.getHost(), req.getPort(),
@@ -416,7 +416,7 @@ public void deregisterInstance(CommonProviderRequest req) throws PolarisExceptio
 
     @Override
     public void heartbeat(CommonProviderRequest req) throws PolarisException {
-        if (ieRegistered) {
+        if (isRegistered) {
             ServiceKey serviceKey = new ServiceKey(req.getNamespace(), req.getService());
             try {
                 this.ttlConsulClient.agentCheckPass(consulContext.getCheckId(), null, consulContext.getAclToken());