From ba5098eaa3c1930055a40f11d6c7e83cf4963700 Mon Sep 17 00:00:00 2001
From: lin-mt <lin-mt@outlook.com>
Date: Fri, 22 May 2020 08:02:13 +0800
Subject: [PATCH 1/2] fix:#2839

---
 .../persistent/raft/RaftStore.java            | 63 ++++++++++---------
 1 file changed, 35 insertions(+), 28 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
index 3dd877b9938..d6c8e3521c2 100644
--- 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
@@ -49,11 +49,13 @@
 @Component
 public class RaftStore {
 
-    private Properties meta = new Properties();
+    private final Properties meta = new Properties();
 
-    private String metaFileName = UtilsAndCommons.DATA_BASE_DIR + File.separator + "meta.properties";
+    private static final String META_FILE_NAME = UtilsAndCommons.DATA_BASE_DIR + File.separator + "meta.properties";
 
-    private String cacheDir = UtilsAndCommons.DATA_BASE_DIR + File.separator + "data";
+    private static final String CACHE_DIR = UtilsAndCommons.DATA_BASE_DIR + File.separator + "data";
+
+    private static final String CACHE_FILE_SUFFIX = ".datum";
 
     public synchronized void loadDatums(RaftCore.Notifier notifier, ConcurrentMap<String, Datum> datums) throws Exception {
 
@@ -80,7 +82,7 @@ public synchronized void loadDatums(RaftCore.Notifier notifier, ConcurrentMap<St
     }
 
     public synchronized Properties loadMeta() throws Exception {
-        File metaFile = new File(metaFileName);
+        File metaFile = new File(META_FILE_NAME);
         if (!metaFile.exists() && !metaFile.getParentFile().mkdirs() && !metaFile.createNewFile()) {
             throw new IllegalStateException("failed to create meta file: " + metaFile.getAbsolutePath());
         }
@@ -99,7 +101,7 @@ public synchronized Datum load(String key) throws Exception {
                 Loggers.RAFT.warn("warning: encountered directory in cache dir: {}", cache.getAbsolutePath());
             }
 
-            if (!StringUtils.equals(cache.getName(), encodeFileName(key))) {
+            if (!StringUtils.equals(cache.getName(), encodeDatumKey(key) + CACHE_FILE_SUFFIX)) {
                 continue;
             }
 
@@ -111,12 +113,16 @@ public synchronized Datum load(String key) throws Exception {
         return null;
     }
 
-    public synchronized Datum readDatum(File file, String namespaceId) throws IOException {
+    private boolean isDatumCacheFile(String fileName) {
+        return fileName.endsWith(CACHE_FILE_SUFFIX);
+    }
 
+    public synchronized Datum readDatum(File file, String namespaceId) throws IOException {
+        if (!isDatumCacheFile(file.getName())) {
+            return null;
+        }
         ByteBuffer buffer;
-        FileChannel fc = null;
-        try {
-            fc = new FileInputStream(file).getChannel();
+        try (FileChannel fc = new FileInputStream(file).getChannel()) {
             buffer = ByteBuffer.allocate((int) file.length());
             fc.read(buffer);
 
@@ -194,24 +200,25 @@ public synchronized Datum readDatum(File file, String namespaceId) throws IOExce
         } catch (Exception e) {
             Loggers.RAFT.warn("waning: failed to deserialize key: {}", file.getName());
             throw e;
-        } finally {
-            if (fc != null) {
-                fc.close();
-            }
         }
     }
 
+    private String cacheFileName(String namespaceId, Datum datum) {
+        String fileName;
+        if (StringUtils.isNotBlank(namespaceId)) {
+            fileName = CACHE_DIR + File.separator + namespaceId + File.separator + encodeDatumKey(datum.key);
+        } else {
+            fileName = CACHE_DIR + File.separator + encodeDatumKey(datum.key);
+        }
+        fileName += CACHE_FILE_SUFFIX;
+        return fileName;
+    }
+
     public synchronized void write(final Datum datum) throws Exception {
 
         String namespaceId = KeyBuilder.getNamespace(datum.key);
 
-        File cacheFile;
-
-        if (StringUtils.isNotBlank(namespaceId)) {
-            cacheFile = new File(cacheDir + File.separator + namespaceId + File.separator + encodeFileName(datum.key));
-        } else {
-            cacheFile = new File(cacheDir + File.separator + encodeFileName(datum.key));
-        }
+        File cacheFile = new File(cacheFileName(namespaceId, datum));
 
         if (!cacheFile.exists() && !cacheFile.getParentFile().mkdirs() && !cacheFile.createNewFile()) {
             MetricsMonitor.getDiskException().increment();
@@ -243,7 +250,7 @@ public synchronized void write(final Datum datum) throws Exception {
                 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));
+                cacheFile = new File(cacheFileName(namespaceId, datum));
                 if (cacheFile.exists() && !cacheFile.delete()) {
                     Loggers.RAFT.error("[RAFT-DELETE] failed to delete old format datum: {}, value: {}",
                         datum.key, datum.value);
@@ -254,7 +261,7 @@ public synchronized void write(final Datum datum) throws Exception {
     }
 
     private File[] listCaches() throws Exception {
-        File cacheDir = new File(this.cacheDir);
+        File cacheDir = new File(CACHE_DIR);
         if (!cacheDir.exists() && !cacheDir.mkdirs()) {
             throw new IllegalStateException("cloud not make out directory: " + cacheDir.getName());
         }
@@ -269,7 +276,7 @@ public void delete(Datum datum) {
 
         if (StringUtils.isNotBlank(namespaceId)) {
 
-            File cacheFile = new File(cacheDir + File.separator + namespaceId + File.separator + encodeFileName(datum.key));
+            File cacheFile = new File(cacheFileName(namespaceId, datum));
             if (cacheFile.exists() && !cacheFile.delete()) {
                 Loggers.RAFT.error("[RAFT-DELETE] failed to delete datum: {}, value: {}", datum.key, datum.value);
                 throw new IllegalStateException("failed to delete datum: " + datum.key);
@@ -278,7 +285,7 @@ public void delete(Datum datum) {
     }
 
     public void updateTerm(long term) throws Exception {
-        File file = new File(metaFileName);
+        File file = new File(META_FILE_NAME);
         if (!file.exists() && !file.getParentFile().mkdirs() && !file.createNewFile()) {
             throw new IllegalStateException("failed to create meta file");
         }
@@ -290,11 +297,11 @@ public void updateTerm(long term) throws Exception {
         }
     }
 
-    private static String encodeFileName(String fileName) {
-        return fileName.replace(':', '#');
+    private static String encodeDatumKey(String datumKey) {
+        return datumKey.replace(':', '#');
     }
 
-    private static String decodeFileName(String fileName) {
-        return fileName.replace("#", ":");
+    private static String decodeDatumKey(String DatumKey) {
+        return DatumKey.replace("#", ":");
     }
 }

From a7bc539d2259e0699bfcd836a3218a379b117cdd Mon Sep 17 00:00:00 2001
From: lin-mt <lin-mt@outlook.com>
Date: Fri, 22 May 2020 08:27:04 +0800
Subject: [PATCH 2/2] fix the style

---
 .../nacos/naming/consistency/persistent/raft/RaftStore.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 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
index d6c8e3521c2..bafd2838ca3 100644
--- 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
@@ -301,7 +301,7 @@ private static String encodeDatumKey(String datumKey) {
         return datumKey.replace(':', '#');
     }
 
-    private static String decodeDatumKey(String DatumKey) {
-        return DatumKey.replace("#", ":");
+    private static String decodeDatumKey(String datumKey) {
+        return datumKey.replace("#", ":");
     }
 }