Merge pull request #1042 from alibaba/hotfix_recognize_080_data

Hotfix recognize 080 data
alibaba · Apr 10, 2019 · 20a6a3b · 20a6a3b
2 parents d649106 + 278aa7e
commit 20a6a3b
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 10 deletions.
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftStore.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftStore.java
@@ -22,6 +22,7 @@
 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.core.Instance;
 import com.alibaba.nacos.naming.core.Instances;
 import com.alibaba.nacos.naming.core.Service;
 import com.alibaba.nacos.naming.misc.Loggers;
@@ -37,6 +38,7 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
+import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -157,8 +159,34 @@ public synchronized Datum readDatum(File file, String namespaceId) throws IOExce
             }
 
             if (KeyBuilder.matchInstanceListKey(file.getName())) {
-                return JSON.parseObject(json, new TypeReference<Datum<Instances>>() {
-                });
+
+                Datum<Instances> instancesDatum;
+
+                try {
+                    instancesDatum = JSON.parseObject(json, new TypeReference<Datum<Instances>>() {
+                    });
+                } catch (Exception e) {
+                    JSONObject jsonObject = JSON.parseObject(json);
+                    instancesDatum = new Datum<>();
+                    instancesDatum.timestamp.set(jsonObject.getLongValue("timestamp"));
+
+                    String key = jsonObject.getString("key");
+                    String serviceName = KeyBuilder.getServiceName(key);
+                    key = key.substring(0, key.indexOf(serviceName)) +
+                        Constants.DEFAULT_GROUP + Constants.SERVICE_INFO_SPLITER + serviceName;
+
+                    instancesDatum.key = key;
+                    instancesDatum.value = new Instances();
+                    instancesDatum.value.setInstanceList(JSON.parseObject(jsonObject.getString("value"),
+                        new TypeReference<List<Instance>>(){}));
+                    if (!instancesDatum.value.getInstanceList().isEmpty()) {
+                        for (Instance instance : instancesDatum.value.getInstanceList()) {
+                            instance.setEphemeral(false);
+                        }
+                    }
+                }
+
+                return instancesDatum;
             }
 
             return JSON.parseObject(json, Datum.class);
@@ -208,6 +236,21 @@ public synchronized void write(final Datum datum) throws Exception {
                 fc.close();
             }
         }
+
+        // remove old format file:
+        if (StringUtils.isNoneBlank(namespaceId)) {
+            if (datum.key.contains(Constants.DEFAULT_GROUP + Constants.SERVICE_INFO_SPLITER)) {
+                String oldFormatKey =
+                    datum.key.replace(Constants.DEFAULT_GROUP + Constants.SERVICE_INFO_SPLITER, StringUtils.EMPTY);
+
+                cacheFile = new File(cacheDir + File.separator + namespaceId + File.separator + encodeFileName(oldFormatKey));
+                if (cacheFile.exists() && !cacheFile.delete()) {
+                    Loggers.RAFT.error("[RAFT-DELETE] failed to delete old format datum: {}, value: {}",
+                        datum.key, datum.value);
+                    throw new IllegalStateException("failed to delete old format datum: " + datum.key);
+                }
+            }
+        }
     }
 
     private File[] listCaches() throws Exception {

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
@@ -135,10 +135,10 @@ public String update(HttpServletRequest request) throws Exception {
         ClientInfo clientInfo = new ClientInfo(agent);
 
         if (clientInfo.type == ClientInfo.ClientType.JAVA &&
-            clientInfo.version.compareTo(VersionUtil.parseVersion("1.0.0")) < 0) {
-            serviceManager.registerInstance(namespaceId, serviceName, parseInstance(request));
-        } else {
+            clientInfo.version.compareTo(VersionUtil.parseVersion("1.0.0")) >= 0) {
             serviceManager.updateInstance(namespaceId, serviceName, parseInstance(request));
+        } else {
+            serviceManager.registerInstance(namespaceId, serviceName, parseInstance(request));
         }
         return "ok";
     }
@@ -364,6 +364,7 @@ public void checkIfDisabled(Service service) throws Exception {
     public JSONObject doSrvIPXT(String namespaceId, String serviceName, String agent, String clusters, String clientIP, int udpPort,
                                 String env, boolean isCheck, String app, String tid, boolean healthyOnly) throws Exception {
 
+        ClientInfo clientInfo = new ClientInfo(agent);
         JSONObject result = new JSONObject();
         Service service = serviceManager.getService(namespaceId, serviceName);
 
@@ -407,8 +408,14 @@ public JSONObject doSrvIPXT(String namespaceId, String serviceName, String agent
                 Loggers.DEBUG_LOG.debug("no instance to serve for service: " + serviceName);
             }
 
+            if (clientInfo.type == ClientInfo.ClientType.JAVA &&
+                clientInfo.version.compareTo(VersionUtil.parseVersion("1.0.0")) >= 0) {
+                result.put("dom", serviceName);
+            } else {
+                result.put("dom", NamingUtils.getServiceName(serviceName));
+            }
+
             result.put("hosts", new JSONArray());
-            result.put("dom", serviceName);
             result.put("name", serviceName);
             result.put("cacheMillis", cacheMillis);
             result.put("lastRefTime", System.currentTimeMillis());
@@ -454,8 +461,6 @@ public JSONObject doSrvIPXT(String namespaceId, String serviceName, String agent
 
         JSONArray hosts = new JSONArray();
 
-        ClientInfo clientInfo = new ClientInfo(agent);
-
         for (Map.Entry<Boolean, List<Instance>> entry : ipMap.entrySet()) {
             List<Instance> ips = entry.getValue();
 

diff --git a/pom.xml b/pom.xml
@@ -94,8 +94,8 @@
         <maven.test.skip>false</maven.test.skip>
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <!-- Compiler settings properties -->
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <!-- Exclude all generated code -->
         <sonar.jacoco.itReportPath>${project.basedir}/../test/target/jacoco-it.exec</sonar.jacoco.itReportPath>