Merge pull request #152 from nacos-group/develop

Release 0.3.8
nacos-group · May 31, 2020 · 5b05f50 · 5b05f50
2 parents acabacc + 7c6de38
commit 5b05f50
Show file tree

Hide file tree

Showing 16 changed files with 161 additions and 126 deletions.
diff --git a/README.md b/README.md
@@ -103,7 +103,7 @@ The path to the target file:
 
 ``` xml
 
-nacos-sync/nacossync-distribution/target/nacosSync.0.3.0.zip
+nacos-sync/nacossync-distribution/target/nacosSync.0.3.8.zip
 
 ```
 

diff --git a/nacossync-console/pom.xml b/nacossync-console/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <artifactId>nacossync-parent</artifactId>
         <groupId>com.alibaba.nacossync</groupId>
-        <version>0.3.7</version>
+        <version>0.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/nacossync-distribution/pom.xml b/nacossync-distribution/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nacossync-parent</artifactId>
         <groupId>com.alibaba.nacossync</groupId>
-        <version>0.3.7</version>
+        <version>0.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

diff --git a/nacossync-test/pom.xml b/nacossync-test/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nacossync-parent</artifactId>
         <groupId>com.alibaba.nacossync</groupId>
-        <version>0.3.7</version>
+        <version>0.3.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>com.alibaba.nacossync</groupId>
             <artifactId>nacossync-worker</artifactId>
-            <version>0.3.7</version>
+            <version>0.3.8</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/nacossync-worker/pom.xml b/nacossync-worker/pom.xml
@@ -16,11 +16,11 @@
     <parent>
         <artifactId>nacossync-parent</artifactId>
         <groupId>com.alibaba.nacossync</groupId>
-        <version>0.3.7</version>
+        <version>0.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>nacossync-worker</artifactId>
-    <version>0.3.7</version>
+    <version>0.3.8</version>
     <properties>
         <zookeeper.version>3.4.9</zookeeper.version>
         <curator.version>4.1.0</curator.version>

diff --git a/nacossync-worker/src/main/java/com/alibaba/nacossync/api/ClusterApi.java b/nacossync-worker/src/main/java/com/alibaba/nacossync/api/ClusterApi.java
@@ -16,25 +16,26 @@
  */
 package com.alibaba.nacossync.api;
 
-import lombok.extern.slf4j.Slf4j;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.nacossync.constant.ClusterTypeEnum;
-import com.alibaba.nacossync.pojo.result.*;
 import com.alibaba.nacossync.pojo.request.ClusterAddRequest;
 import com.alibaba.nacossync.pojo.request.ClusterDeleteRequest;
 import com.alibaba.nacossync.pojo.request.ClusterDetailQueryRequest;
 import com.alibaba.nacossync.pojo.request.ClusterListQueryRequest;
+import com.alibaba.nacossync.pojo.result.ClusterAddResult;
+import com.alibaba.nacossync.pojo.result.ClusterDeleteResult;
+import com.alibaba.nacossync.pojo.result.ClusterDetailQueryResult;
+import com.alibaba.nacossync.pojo.result.ClusterListQueryResult;
+import com.alibaba.nacossync.pojo.result.ClusterTypeResult;
 import com.alibaba.nacossync.template.SkyWalkerTemplate;
 import com.alibaba.nacossync.template.processor.ClusterAddProcessor;
 import com.alibaba.nacossync.template.processor.ClusterDeleteProcessor;
 import com.alibaba.nacossync.template.processor.ClusterDetailQueryProcessor;
 import com.alibaba.nacossync.template.processor.ClusterListQueryProcessor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author NacosSync
@@ -44,17 +45,22 @@
 @RestController
 public class ClusterApi {
 
-    @Autowired
-    private ClusterAddProcessor clusterAddProcessor;
+    private final ClusterAddProcessor clusterAddProcessor;
+
+    private final ClusterDeleteProcessor clusterDeleteProcessor;
 
-    @Autowired
-    private ClusterDeleteProcessor clusterDeleteProcessor;
+    private final ClusterDetailQueryProcessor clusterDetailQueryProcessor;
 
-    @Autowired
-    private ClusterDetailQueryProcessor clusterDetailQueryProcessor;
+    private final ClusterListQueryProcessor clusterListQueryProcessor;
 
-    @Autowired
-    private ClusterListQueryProcessor clusterListQueryProcessor;
+    public ClusterApi(
+        ClusterAddProcessor clusterAddProcessor, ClusterDeleteProcessor clusterDeleteProcessor,
+        ClusterDetailQueryProcessor clusterDetailQueryProcessor, ClusterListQueryProcessor clusterListQueryProcessor) {
+        this.clusterAddProcessor = clusterAddProcessor;
+        this.clusterDeleteProcessor = clusterDeleteProcessor;
+        this.clusterDetailQueryProcessor = clusterDetailQueryProcessor;
+        this.clusterListQueryProcessor = clusterListQueryProcessor;
+    }
 
     @RequestMapping(path = "/v1/cluster/list", method = RequestMethod.GET)
     public ClusterListQueryResult clusters(ClusterListQueryRequest clusterListQueryRequest) {

diff --git a/nacossync-worker/src/main/java/com/alibaba/nacossync/api/TaskApi.java b/nacossync-worker/src/main/java/com/alibaba/nacossync/api/TaskApi.java
@@ -1,36 +1,39 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
+ * file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
+ * to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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.
+ * 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.alibaba.nacossync.api;
 
-import com.alibaba.nacossync.pojo.request.*;
-import com.alibaba.nacossync.template.processor.*;
-import lombok.extern.slf4j.Slf4j;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
+import com.alibaba.nacossync.pojo.request.TaskAddRequest;
+import com.alibaba.nacossync.pojo.request.TaskDeleteInBatchRequest;
+import com.alibaba.nacossync.pojo.request.TaskDeleteRequest;
+import com.alibaba.nacossync.pojo.request.TaskDetailQueryRequest;
+import com.alibaba.nacossync.pojo.request.TaskListQueryRequest;
+import com.alibaba.nacossync.pojo.request.TaskUpdateRequest;
 import com.alibaba.nacossync.pojo.result.BaseResult;
 import com.alibaba.nacossync.pojo.result.TaskAddResult;
 import com.alibaba.nacossync.pojo.result.TaskDetailQueryResult;
 import com.alibaba.nacossync.pojo.result.TaskListQueryResult;
 import com.alibaba.nacossync.template.SkyWalkerTemplate;
+import com.alibaba.nacossync.template.processor.TaskAddProcessor;
+import com.alibaba.nacossync.template.processor.TaskDeleteInBatchProcessor;
+import com.alibaba.nacossync.template.processor.TaskDeleteProcessor;
+import com.alibaba.nacossync.template.processor.TaskDetailProcessor;
+import com.alibaba.nacossync.template.processor.TaskListQueryProcessor;
+import com.alibaba.nacossync.template.processor.TaskUpdateProcessor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author NacosSync
@@ -40,46 +43,49 @@
 @RestController
 public class TaskApi {
 
-    @Autowired
-    private TaskUpdateProcessor taskUpdateProcessor;
+    private final TaskUpdateProcessor taskUpdateProcessor;
 
-    @Autowired
-    private TaskAddProcessor taskAddProcessor;
+    private final TaskAddProcessor taskAddProcessor;
 
-    @Autowired
-    private TaskDeleteProcessor taskDeleteProcessor;
-
-    @Autowired
-    private TaskDeleteInBatchProcessor taskDeleteInBatchProcessor;
+    private final TaskDeleteProcessor taskDeleteProcessor;
 
-    @Autowired
-    private TaskListQueryProcessor taskListQueryProcessor;
+    private final TaskDeleteInBatchProcessor taskDeleteInBatchProcessor;
 
-    @Autowired
-    private TaskDetailProcessor taskDetailProcessor;
+    private final TaskListQueryProcessor taskListQueryProcessor;
+
+    private final TaskDetailProcessor taskDetailProcessor;
+
+    public TaskApi(TaskUpdateProcessor taskUpdateProcessor, TaskAddProcessor taskAddProcessor,
+        TaskDeleteProcessor taskDeleteProcessor, TaskDeleteInBatchProcessor taskDeleteInBatchProcessor,
+        TaskListQueryProcessor taskListQueryProcessor, TaskDetailProcessor taskDetailProcessor) {
+        this.taskUpdateProcessor = taskUpdateProcessor;
+        this.taskAddProcessor = taskAddProcessor;
+        this.taskDeleteProcessor = taskDeleteProcessor;
+        this.taskDeleteInBatchProcessor = taskDeleteInBatchProcessor;
+        this.taskListQueryProcessor = taskListQueryProcessor;
+        this.taskDetailProcessor = taskDetailProcessor;
+    }
 
     @RequestMapping(path = "/v1/task/list", method = RequestMethod.GET)
     public TaskListQueryResult tasks(TaskListQueryRequest taskListQueryRequest) {
 
-        return SkyWalkerTemplate.run(taskListQueryProcessor, taskListQueryRequest,
-                new TaskListQueryResult());
+        return SkyWalkerTemplate.run(taskListQueryProcessor, taskListQueryRequest, new TaskListQueryResult());
     }
 
     @RequestMapping(path = "/v1/task/detail", method = RequestMethod.GET)
     public TaskDetailQueryResult getByTaskId(TaskDetailQueryRequest taskDetailQueryRequest) {
 
-        return SkyWalkerTemplate.run(taskDetailProcessor, taskDetailQueryRequest,
-                new TaskDetailQueryResult());
+        return SkyWalkerTemplate.run(taskDetailProcessor, taskDetailQueryRequest, new TaskDetailQueryResult());
     }
 
     @RequestMapping(path = "/v1/task/delete", method = RequestMethod.DELETE)
     public BaseResult deleteTask(TaskDeleteRequest taskDeleteRequest) {
 
         return SkyWalkerTemplate.run(taskDeleteProcessor, taskDeleteRequest, new BaseResult());
     }
-    
+
     /**
-     * @author yongchao9 
+     * @author yongchao9
      * @param taskBatchDeleteRequest
      * @return
      */

diff --git a/nacossync-worker/src/main/java/com/alibaba/nacossync/extension/SyncManagerService.java b/nacossync-worker/src/main/java/com/alibaba/nacossync/extension/SyncManagerService.java
@@ -12,23 +12,21 @@
  */
 package com.alibaba.nacossync.extension;
 
+import static com.alibaba.nacossync.util.SkyWalkerUtil.generateSyncKey;
+
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacossync.cache.SkyWalkerCacheServices;
 import com.alibaba.nacossync.constant.ClusterTypeEnum;
 import com.alibaba.nacossync.extension.annotation.NacosSyncService;
 import com.alibaba.nacossync.pojo.model.TaskDO;
+import java.util.concurrent.ConcurrentHashMap;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Service;
 
-import java.util.Hashtable;
-
-import static com.alibaba.nacossync.util.SkyWalkerUtil.generateSyncKey;
-
 /**
  * @author NacosSync
  * @version $Id: SyncManagerService.java, v 0.1 2018-09-25 PM5:17 NacosSync Exp $$
@@ -37,13 +35,17 @@
 @Service
 public class SyncManagerService implements InitializingBean, ApplicationContextAware {
 
-    @Autowired
-    protected SkyWalkerCacheServices skyWalkerCacheServices;
+    protected final SkyWalkerCacheServices skyWalkerCacheServices;
 
-    private Hashtable<String, SyncService> syncServiceMap = new Hashtable<String, SyncService>();
+    private ConcurrentHashMap<String, SyncService> syncServiceMap = new ConcurrentHashMap<String, SyncService>();
 
     private ApplicationContext applicationContext;
 
+    public SyncManagerService(
+        SkyWalkerCacheServices skyWalkerCacheServices) {
+        this.skyWalkerCacheServices = skyWalkerCacheServices;
+    }
+
     public boolean delete(TaskDO taskDO) throws NacosException {
 
         return getSyncService(taskDO.getSourceClusterId(), taskDO.getDestClusterId()).delete(taskDO);

diff --git a/...rker/src/main/java/com/alibaba/nacossync/extension/impl/ConsulSyncToNacosServiceImpl.java b/...rker/src/main/java/com/alibaba/nacossync/extension/impl/ConsulSyncToNacosServiceImpl.java
@@ -12,6 +12,7 @@
  */
 package com.alibaba.nacossync.extension.impl;
 
+import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.api.naming.NamingService;
 import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.alibaba.nacossync.cache.SkyWalkerCacheServices;
@@ -96,22 +97,8 @@ public boolean sync(TaskDO taskDO) {
                 consulClient.getHealthServices(taskDO.getServiceName(), true, QueryParams.DEFAULT);
             List<HealthService> healthServiceList = response.getValue();
             Set<String> instanceKeys = new HashSet<>();
-            for (HealthService healthService : healthServiceList) {
-                if (needSync(ConsulUtils.transferMetadata(healthService.getService().getTags()))) {
-                    destNamingService.registerInstance(taskDO.getServiceName(),
-                        buildSyncInstance(healthService, taskDO));
-                    instanceKeys.add(composeInstanceKey(healthService.getService().getAddress(),
-                        healthService.getService().getPort()));
-                }
-            }
-            List<Instance> allInstances = destNamingService.getAllInstances(taskDO.getServiceName());
-            for (Instance instance : allInstances) {
-                if (needDelete(instance.getMetadata(), taskDO)
-                    && !instanceKeys.contains(composeInstanceKey(instance.getIp(), instance.getPort()))) {
-
-                    destNamingService.deregisterInstance(taskDO.getServiceName(), instance.getIp(), instance.getPort());
-                }
-            }
+            overrideAllInstance(taskDO, destNamingService, healthServiceList, instanceKeys);
+            cleanAllOldInstance(taskDO, destNamingService, instanceKeys);
             specialSyncEventBus.subscribe(taskDO, this::sync);
         } catch (Exception e) {
             log.error("Sync task from consul to nacos was failed, taskId:{}", taskDO.getTaskId(), e);
@@ -121,6 +108,30 @@ public boolean sync(TaskDO taskDO) {
         return true;
     }
 
+    private void cleanAllOldInstance(TaskDO taskDO, NamingService destNamingService, Set<String> instanceKeys)
+        throws NacosException {
+        List<Instance> allInstances = destNamingService.getAllInstances(taskDO.getServiceName());
+        for (Instance instance : allInstances) {
+            if (needDelete(instance.getMetadata(), taskDO)
+                && !instanceKeys.contains(composeInstanceKey(instance.getIp(), instance.getPort()))) {
+
+                destNamingService.deregisterInstance(taskDO.getServiceName(), instance.getIp(), instance.getPort());
+            }
+        }
+    }
+
+    private void overrideAllInstance(TaskDO taskDO, NamingService destNamingService,
+        List<HealthService> healthServiceList, Set<String> instanceKeys) throws NacosException {
+        for (HealthService healthService : healthServiceList) {
+            if (needSync(ConsulUtils.transferMetadata(healthService.getService().getTags()))) {
+                destNamingService.registerInstance(taskDO.getServiceName(),
+                    buildSyncInstance(healthService, taskDO));
+                instanceKeys.add(composeInstanceKey(healthService.getService().getAddress(),
+                    healthService.getService().getPort()));
+            }
+        }
+    }
+
     private Instance buildSyncInstance(HealthService instance, TaskDO taskDO) {
         Instance temp = new Instance();
         temp.setIp(instance.getService().getAddress());
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,7 +103,7 @@ The path to the target file: @@
     ``` xml
-    nacos-sync/nacossync-distribution/target/nacosSync.0.3.0.zip
+    nacos-sync/nacossync-distribution/target/nacosSync.0.3.8.zip
     ```
@@ Expand Down @@