alibaba · nkorange · Mar 16, 2019 · Mar 15, 2019 · Mar 15, 2019 · Mar 15, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 1.0.0-RC1(Mar 15, 2019)
+
+* [#870] About Nacos's namespace and tenant design
+* [#869] Client exception message is confusing
+* [#866] BeatInfo scheduled property may have the memory visibility issue
+* [#865] checksum value is not correct
+* [#839] Refactor API URLs 
+* [#811] ApiCommands.updateIpPublish countDownLatch timeout issue
+* [#809] Instance field 'valid' should be deprecated and replaced by 'healthy'
+* [#803] Nacos front-end function regression plan and landing
+* [#801] Nacos uses nignx as a best practice article for current limiting.
+* [#757] The word 'domain' should be replaced by 'service'
+* [#745] Support server running mode in CP, AP or mixed
+* [#744] The exact status of server should be stored and controlled
+* [#725] Will the nacos registry be how to do multi-environment deployment?
+* [#677] Support ephemeral instances and persistent instances
+* [#651] Remove old API entry 'APICommands'
+* [#650] Refactor server list management to make it irrelevant to consistency protocol
+* [#634] Add global push enable switch and data query enable switch
+* [#629] Server data needs warm up before open traffic
+* [#502] Registering ephemeral instance as well as persistent instances
+* [#501] Health check mode confict when building muilt clusters whit nacos sync + nacos
+* [#479] Metadata should be displayed and edited using standard property syntax
+* [#327] Inform the ACM SDK of the RAM role name and access the configuration ? ?
+* [#269] need to support service group in naming module
+
 ## 0.9.0(Feb 28, 2019)
 
 * [#840] Nacos server adds startup mode to distinguish between config and naming.

diff --git a/api/pom.xml b/api/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-RC1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/client/pom.xml b/client/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/cmdb/pom.xml b/cmdb/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>nacos-all</artifactId>
         <groupId>com.alibaba.nacos</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/common/pom.xml b/common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/config/pom.xml b/config/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-RC1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/console/pom.xml b/console/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-RC1</version>
     </parent>
     <artifactId>nacos-console</artifactId>
     <!--<packaging>war</packaging>-->

diff --git a/console/src/main/resources/META-INF/nacos-default.properties b/console/src/main/resources/META-INF/nacos-default.properties
@@ -71,3 +71,4 @@ nacos.naming.distro.batchSyncKeyCount=1000
 nacos.naming.distro.initDataRatio=0.9
 nacos.naming.distro.syncRetryDelay=5000
 nacos.naming.data.warmup=false
+nacos.naming.expireInstance=true
diff --git a/core/pom.xml b/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/distribution/conf/application.properties b/distribution/conf/application.properties
@@ -45,3 +45,4 @@ nacos.naming.distro.batchSyncKeyCount=1000
 nacos.naming.distro.initDataRatio=0.9
 nacos.naming.distro.syncRetryDelay=5000
 nacos.naming.data.warmup=true
+nacos.naming.expireInstance=true
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example/pom.xml b/example/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/naming/pom.xml b/naming/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...a/com/alibaba/nacos/naming/consistency/ephemeral/distro/DistroConsistencyServiceImpl.java b/...a/com/alibaba/nacos/naming/consistency/ephemeral/distro/DistroConsistencyServiceImpl.java
@@ -23,6 +23,7 @@
 import com.alibaba.nacos.naming.cluster.ServerStatus;
 import com.alibaba.nacos.naming.cluster.servers.Server;
 import com.alibaba.nacos.naming.cluster.transport.Serializer;
+import com.alibaba.nacos.naming.consistency.ApplyAction;
 import com.alibaba.nacos.naming.consistency.Datum;
 import com.alibaba.nacos.naming.consistency.KeyBuilder;
 import com.alibaba.nacos.naming.consistency.RecordListener;
@@ -32,13 +33,15 @@
 import com.alibaba.nacos.naming.core.Service;
 import com.alibaba.nacos.naming.misc.*;
 import com.alibaba.nacos.naming.pojo.Record;
+import org.apache.commons.lang3.StringUtils;
+import org.javatuples.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.*;
 
 /**
  * A consistency protocol algorithm called <b>Partition</b>
@@ -57,6 +60,18 @@
 @org.springframework.stereotype.Service("distroConsistencyService")
 public class DistroConsistencyServiceImpl implements EphemeralConsistencyService {
 
+    private ScheduledExecutorService executor = new ScheduledThreadPoolExecutor(1, new ThreadFactory() {
+        @Override
+        public Thread newThread(Runnable r) {
+            Thread t = new Thread(r);
+
+            t.setDaemon(true);
+            t.setName("com.alibaba.nacos.naming.distro.notifier");
+
+            return t;
+        }
+    });
+
     @Autowired
     private DistroMapper distroMapper;
 
@@ -83,7 +98,9 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
 
     private boolean initialized = false;
 
-    private volatile Map<String, List<RecordListener>> listeners = new ConcurrentHashMap<>();
+    public volatile Notifier notifier = new Notifier();
+
+    private volatile Map<String, CopyOnWriteArrayList<RecordListener>> listeners = new ConcurrentHashMap<>();
 
     @PostConstruct
     public void init() throws Exception {
@@ -97,6 +114,8 @@ public void run() {
                 }
             }
         });
+
+        executor.submit(notifier);
     }
 
     public void load() throws Exception {
@@ -154,13 +173,8 @@ public void onPut(String key, Record value) {
         if (!listeners.containsKey(key)) {
             return;
         }
-        for (RecordListener listener : listeners.get(key)) {
-            try {
-                listener.onChange(key, value);
-            } catch (Exception e) {
-                Loggers.EPHEMERAL.error("notify " + listener + ", key:" + key + " failed.", e);
-            }
-        }
+
+        notifier.addTask(key, ApplyAction.CHANGE);
     }
 
     public void onRemove(String key) {
@@ -170,13 +184,8 @@ public void onRemove(String key) {
         if (!listeners.containsKey(key)) {
             return;
         }
-        for (RecordListener listener : listeners.get(key)) {
-            try {
-                listener.onDelete(key);
-            } catch (Exception e) {
-                Loggers.EPHEMERAL.error("notify " + listener + ", key:" + key + " failed.", e);
-            }
-            }
+
+        notifier.addTask(key, ApplyAction.DELETE);
     }
 
     public void onReceiveChecksums(Map<String, String> checksumMap, String server) {
@@ -288,7 +297,7 @@ public void processData(byte[] data) throws Exception {
     @Override
     public void listen(String key, RecordListener listener) throws NacosException {
         if (!listeners.containsKey(key)) {
-            listeners.put(key, new ArrayList<>());
+            listeners.put(key, new CopyOnWriteArrayList<>());
         }
         listeners.get(key).add(listener);
     }
@@ -314,4 +323,78 @@ public boolean isAvailable() {
     public boolean isInitialized() {
         return initialized || !globalConfig.isDataWarmup();
     }
+
+    public class Notifier implements Runnable {
+
+        private ConcurrentHashMap<String, String> services = new ConcurrentHashMap<>(10 * 1024);
+
+        private BlockingQueue<Pair> tasks = new LinkedBlockingQueue<Pair>(1024 * 1024);
+
+        public void addTask(String datumKey, ApplyAction action) {
+
+            if (services.containsKey(datumKey) && action == ApplyAction.CHANGE) {
+                return;
+            }
+            if (action == ApplyAction.CHANGE) {
+                services.put(datumKey, StringUtils.EMPTY);
+            }
+            tasks.add(Pair.with(datumKey, action));
+        }
+
+        public int getTaskSize() {
+            return tasks.size();
+        }
+
+        @Override
+        public void run() {
+            Loggers.EPHEMERAL.info("distro notifier started");
+
+            while (true) {
+                try {
+
+                    Pair pair = tasks.take();
+
+                    if (pair == null) {
+                        continue;
+                    }
+
+                    String datumKey = (String) pair.getValue0();
+                    ApplyAction action = (ApplyAction) pair.getValue1();
+
+                    services.remove(datumKey);
+
+                    int count = 0;
+
+                    if (!listeners.containsKey(datumKey)) {
+                        continue;
+                    }
+
+                    for (RecordListener listener : listeners.get(datumKey)) {
+
+                        count++;
+
+                        try {
+                            if (action == ApplyAction.CHANGE) {
+                                listener.onChange(datumKey, dataStore.get(datumKey).value);
+                                continue;
+                            }
+
+                            if (action == ApplyAction.DELETE) {
+                                listener.onDelete(datumKey);
+                                continue;
+                            }
+                        } catch (Throwable e) {
+                            Loggers.EPHEMERAL.error("[NACOS-DISTRO] error while notifying listener of key: {} {}", datumKey, e);
+                        }
+                    }
+
+                    if (Loggers.EPHEMERAL.isDebugEnabled()) {
+                        Loggers.EPHEMERAL.debug("[NACOS-DISTRO] datum change notified, key: {}, listener count: {}", datumKey, count);
+                    }
+                } catch (Throwable e) {
+                    Loggers.EPHEMERAL.error("[NACOS-DISTRO] Error while handling notifying task", e);
+                }
+            }
+        }
+    }
 }
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
@@ -557,7 +557,7 @@ public void onThrowable(Throwable t) {
                         }
                     });
                 } catch (Exception e) {
-                    Loggers.RAFT.error("VIPSRV error while sending heart-beat to peer: {} {}", server, e);
+                    Loggers.RAFT.error("error while sending heart-beat to peer: {} {}", server, e);
                     MetricsMonitor.getLeaderSendBeatFailedException().increment();
                 }
             }

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/Service.java b/naming/src/main/java/com/alibaba/nacos/naming/core/Service.java
@@ -154,7 +154,7 @@ public boolean matchUnlistenKey(String key) {
     @Override
     public void onChange(String key, Instances value) throws Exception {
 
-        Loggers.RAFT.info("[NACOS-RAFT] datum is changed, key: {}, value: {}", key, value);
+        Loggers.SRV_LOG.info("[NACOS-RAFT] datum is changed, key: {}, value: {}", key, value);
 
         for (Instance ip : value.getInstanceList()) {
 

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java
@@ -22,10 +22,7 @@
 import com.alibaba.nacos.naming.core.DistroMapper;
 import com.alibaba.nacos.naming.core.Instance;
 import com.alibaba.nacos.naming.core.Service;
-import com.alibaba.nacos.naming.misc.HttpClient;
-import com.alibaba.nacos.naming.misc.Loggers;
-import com.alibaba.nacos.naming.misc.NamingProxy;
-import com.alibaba.nacos.naming.misc.UtilsAndCommons;
+import com.alibaba.nacos.naming.misc.*;
 import com.alibaba.nacos.naming.push.PushService;
 import com.ning.http.client.AsyncCompletionHandler;
 import com.ning.http.client.Response;
@@ -57,6 +54,10 @@ public DistroMapper getDistroMapper() {
         return SpringContext.getAppContext().getBean(DistroMapper.class);
     }
 
+    public GlobalConfig getGlobalConfig() {
+        return SpringContext.getAppContext().getBean(GlobalConfig.class);
+    }
+
     public String taskKey() {
         return service.getName();
     }
@@ -85,6 +86,10 @@ public void run() {
                 }
             }
 
+            if (!getGlobalConfig().isExpireInstance()) {
+                return;
+            }
+
             // then remove obsolete instances:
             for (Instance instance : instances) {
                 if (System.currentTimeMillis() - instance.getLastBeat() > service.getIpDeleteTimeout()) {

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalConfig.java b/naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalConfig.java
@@ -42,6 +42,9 @@ public class GlobalConfig {
     @Value("${nacos.naming.data.warmup}")
     private boolean dataWarmup = false;
 
+    @Value("${nacos.naming.expireInstance}")
+    private boolean expireInstance = true;
+
     public int getTaskDispatchPeriod() {
         return taskDispatchPeriod;
     }
@@ -61,4 +64,8 @@ public int getTaskDispatchThreadCount() {
     public boolean isDataWarmup() {
         return dataWarmup;
     }
+
+    public boolean isExpireInstance() {
+        return expireInstance;
+    }
 }
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java b/naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
@@ -112,7 +112,7 @@ public static HttpResult request(String url, List<String> headers, Map<String, S
 
             return getResult(conn);
         } catch (Exception e) {
-            Loggers.SRV_LOG.warn("[VIPSRV] Exception while request: {}, caused: {}", url, e);
+            Loggers.SRV_LOG.warn("Exception while request: {}, caused: {}", url, e);
             return new HttpResult(500, e.toString(), Collections.<String, String>emptyMap());
         } finally {
             if (conn != null) {