Merge pull request #213 from nacos-group/develop

0.4.4

Author: paderlol

nacossync-console/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <artifactId>nacossync-parent</artifactId>
         <groupId>com.alibaba.nacossync</groupId>
-        <version>0.4.3</version>
+        <version>0.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

nacossync-console/src/main/resources/static/js/main.1cd0c600.js

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nacossync-parent</artifactId>
         <groupId>com.alibaba.nacossync</groupId>
-        <version>0.4.3</version>
+        <version>0.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

nacossync-distribution/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>nacossync-parent</artifactId>
         <groupId>com.alibaba.nacossync</groupId>
-        <version>0.4.3</version>
+        <version>0.4.4</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.3</version>
+            <version>0.4.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

nacossync-test/pom.xml

@@ -16,11 +16,11 @@
     <parent>
         <artifactId>nacossync-parent</artifactId>
         <groupId>com.alibaba.nacossync</groupId>
-        <version>0.4.3</version>
+        <version>0.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>nacossync-worker</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <properties>
         <zookeeper.version>3.4.9</zookeeper.version>
         <curator.version>4.1.0</curator.version>

nacossync-worker/pom.xml

@@ -103,26 +103,27 @@ public boolean sync(TaskDO taskDO) {
 
                         List<Instance> sourceInstances = sourceNamingService.getAllInstances(taskDO.getServiceName(),
                             new ArrayList<>(), false);
-                        log.info("任务Id:{},迁入实例数量:{}", taskId, sourceInstances.size());
                         // 先删除不存在的
                         this.removeInvalidInstance(taskDO, taskId, destNamingService, sourceInstances);
-
+                        Set<String> latestSyncInstance = new TreeSet<>();
                         //再次添加新实例
+                        Set<String> instanceKeys = sourceInstanceSnapshot.get(taskId);
                         for (Instance instance : sourceInstances) {
                             if (needSync(instance.getMetadata())) {
-                                destNamingService.registerInstance(taskDO.getServiceName(),
-                                    buildSyncInstance(instance, taskDO));
-                                this.sourceInstanceSnapshot.compute(taskId, (key, value) -> {
-                                    if (CollectionUtils.isEmpty(value)) {
-                                        value = new TreeSet<>();
-                                    }
-                                    log.info("任务Id:{},已同步实例:{}", taskId, composeInstanceKey(instance));
-                                    value.add(composeInstanceKey(instance));
-                                    return value;
-                                });
+                                String instanceKey = composeInstanceKey(instance);
+                                if (CollectionUtils.isEmpty(instanceKeys) || !instanceKeys.contains(instanceKey)) {
+                                    destNamingService.registerInstance(taskDO.getServiceName(),
+                                        buildSyncInstance(instance, taskDO));
+                                }
+                                latestSyncInstance.add(instanceKey);
+
                             }
                         }
+                        if (CollectionUtils.isNotEmpty(latestSyncInstance)) {
 
+                            log.info("任务Id:{},已同步实例个数:{}", taskId, latestSyncInstance.size());
+                            sourceInstanceSnapshot.put(taskId, latestSyncInstance);
+                        }
                     } catch (Exception e) {
                         log.error("event process fail, taskId:{}", taskId, e);
                         metricsManager.recordError(MetricsStatisticsType.SYNC_ERROR);

nacossync-worker/src/main/java/com/alibaba/nacossync/extension/impl/NacosSyncToNacosServiceImpl.java

@@ -18,7 +18,7 @@
 
     <groupId>com.alibaba.nacossync</groupId>
     <artifactId>nacossync-parent</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</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.3</version>
+                <version>0.4.4</version>
             </dependency>
         </dependencies>
     </dependencyManagement>