Merge pull request #176 from nacos-group/develop

Develop
nacos-group · Oct 2, 2020 · d89e8be · d89e8be
2 parents f1ac50c + 88832f6
commit d89e8be
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 21 deletions.
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.4.0</version>
+        <version>0.4.1</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.4.0</version>
+        <version>0.4.1</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.4.0</version>
+        <version>0.4.1</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.4.0</version>
+            <version>0.4.1</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.4.0</version>
+        <version>0.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>nacossync-worker</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1</version>
     <properties>
         <zookeeper.version>3.4.9</zookeeper.version>
         <curator.version>4.1.0</curator.version>

diff --git a/...rker/src/main/java/com/alibaba/nacossync/extension/impl/EurekaSyncToNacosServiceImpl.java b/...rker/src/main/java/com/alibaba/nacossync/extension/impl/EurekaSyncToNacosServiceImpl.java
@@ -28,13 +28,14 @@
 import com.alibaba.nacossync.monitor.MetricsManager;
 import com.alibaba.nacossync.pojo.model.TaskDO;
 import com.netflix.appinfo.InstanceInfo;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * eureka
  * 
@@ -70,9 +71,10 @@ public boolean delete(TaskDO taskDO) {
 
         try {
             specialSyncEventBus.unsubscribe(taskDO);
-            NamingService destNamingService = nacosServerHolder.get(taskDO.getDestClusterId(), taskDO.getNameSpace());
-            List<Instance> allInstances = destNamingService.getAllInstances(taskDO.getServiceName());
-            deleteAllInstance(taskDO, destNamingService, allInstances);
+            EurekaNamingService eurekaNamingService = eurekaServerHolder.get(taskDO.getSourceClusterId(), null);
+            NamingService destNamingService = nacosServerHolder.get(taskDO.getDestClusterId(), null);
+            List<InstanceInfo> eurekaInstances = eurekaNamingService.getApplications(taskDO.getServiceName());
+            deleteAllInstanceFromEureka(taskDO, destNamingService, eurekaInstances);
 
         } catch (Exception e) {
             log.error("delete a task from eureka to nacos was failed, taskId:{}", taskDO.getTaskId(), e);
@@ -119,6 +121,17 @@ private void addValidInstance(TaskDO taskDO, NamingService destNamingService, Li
             }
         }
     }
+
+    private void deleteAllInstanceFromEureka(TaskDO taskDO, NamingService destNamingService, List<InstanceInfo> eurekaInstances)
+            throws NacosException {
+        for (InstanceInfo instance : eurekaInstances) {
+            if (needSync(instance.getMetadata())) {
+                log.info("Delete service instance from Eureka, serviceName={}, Ip={}, port={}",
+                        instance.getAppName(), instance.getIPAddr(), instance.getPort());
+                destNamingService.deregisterInstance(taskDO.getServiceName(), buildSyncInstance(instance, taskDO));
+            }
+        }
+    }
 
     private void removeInvalidInstance(TaskDO taskDO, NamingService destNamingService,
         List<InstanceInfo> eurekaInstances, List<Instance> nacosInstances) throws NacosException {

diff --git a/...nc-worker/src/main/java/com/alibaba/nacossync/template/processor/TaskDeleteProcessor.java b/...nc-worker/src/main/java/com/alibaba/nacossync/template/processor/TaskDeleteProcessor.java
@@ -16,15 +16,16 @@
  */
 package com.alibaba.nacossync.template.processor;
 
-import lombok.extern.slf4j.Slf4j;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.nacossync.dao.TaskAccessService;
-import com.alibaba.nacossync.pojo.result.BaseResult;
+import com.alibaba.nacossync.event.DeleteTaskEvent;
+import com.alibaba.nacossync.pojo.model.TaskDO;
 import com.alibaba.nacossync.pojo.request.TaskDeleteRequest;
+import com.alibaba.nacossync.pojo.result.BaseResult;
 import com.alibaba.nacossync.template.Processor;
+import com.google.common.eventbus.EventBus;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * @author NacosSync
@@ -36,11 +37,15 @@ public class TaskDeleteProcessor implements Processor<TaskDeleteRequest, BaseRes
 
     @Autowired
     private TaskAccessService taskAccessService;
+    @Autowired
+    private EventBus eventBus;
 
     @Override
     public void process(TaskDeleteRequest taskDeleteRequest, BaseResult baseResult,
                         Object... others) {
-
+        TaskDO taskDO = taskAccessService.findByTaskId(taskDeleteRequest.getTaskId());
+        eventBus.post(new DeleteTaskEvent(taskDO));
+        log.info("删除同步任务数据之前，发出一个同步事件:" + taskDO);
         taskAccessService.deleteTaskById(taskDeleteRequest.getTaskId());
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 
     <groupId>com.alibaba.nacossync</groupId>
     <artifactId>nacossync-parent</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1</version>
     <modules>
         <module>nacossync-console</module>
         <module>nacossync-worker</module>
@@ -73,7 +73,7 @@
             <dependency>
                 <groupId>com.alibaba.nacossync</groupId>
                 <artifactId>nacossync-worker</artifactId>
-                <version>0.4.0</version>
+                <version>0.4.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>