diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/AppendEOFFlagThread.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/AppendEOFFlagThread.java
index 7dcb55208..480b2f85c 100644
--- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/AppendEOFFlagThread.java
+++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/AppendEOFFlagThread.java
@@ -14,6 +14,7 @@ class AppendEOFFlagThread extends Thread {
     private File[] dataBufferFiles;
 
     public AppendEOFFlagThread(File[] dataBufferFiles) {
+    	super("AppendEOFFlagThread");
         this.dataBufferFiles = dataBufferFiles;
     }
 
diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java
index a599ea953..5071ac07c 100644
--- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java
+++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java
@@ -23,8 +23,8 @@ public class DataBufferThread extends Thread {
     private FileOutputStream outputStream;
     private AtomicInteger index = new AtomicInteger();
 
-    public DataBufferThread() {
-    	super("DataBufferThread");
+    public DataBufferThread(int threadIdx) {
+    	super("DataBufferThread_" + threadIdx);
         try {
             file = new File(DATA_BUFFER_FILE_PARENT_DIRECTORY, getFileName());
             if (file.exists()) {
diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThreadContainer.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThreadContainer.java
index 8e25666d2..6dfd89e00 100644
--- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThreadContainer.java
+++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThreadContainer.java
@@ -1,10 +1,6 @@
 package com.ai.cloud.skywalking.reciever.buffer;
 
-import com.ai.cloud.skywalking.reciever.conf.Config;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.comparator.NameFileComparator;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import static com.ai.cloud.skywalking.reciever.conf.Config.Persistence.MAX_APPEND_EOF_FLAGS_THREAD_NUMBER;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -12,7 +8,11 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
-import static com.ai.cloud.skywalking.reciever.conf.Config.Persistence.MAX_APPEND_EOF_FLAGS_THREAD_NUMBER;
+import org.apache.commons.io.comparator.NameFileComparator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import com.ai.cloud.skywalking.reciever.conf.Config;
 
 public class DataBufferThreadContainer {
 
@@ -57,7 +57,7 @@ public class DataBufferThreadContainer {
         logger.info("Data buffer thread size {} begin to init ", Config.Server.
                 MAX_DEAL_DATA_THREAD_NUMBER);
         for (int i = 0; i < Config.Server.MAX_DEAL_DATA_THREAD_NUMBER; i++) {
-            DataBufferThread dataBufferThread = new DataBufferThread();
+            DataBufferThread dataBufferThread = new DataBufferThread(i);
             dataBufferThread.start();
             buffers.add(dataBufferThread);
         }
diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/persistance/PersistenceThread.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/persistance/PersistenceThread.java
index 3ded9e928..b42f1a011 100644
--- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/persistance/PersistenceThread.java
+++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/persistance/PersistenceThread.java
@@ -17,8 +17,8 @@ public class PersistenceThread extends Thread {
 
     private Logger logger = LogManager.getLogger(PersistenceThread.class);
 
-    PersistenceThread() {
-        super("PersistenceThread");
+    PersistenceThread(int threadIdx) {
+        super("PersistenceThread_" + threadIdx);
     }
 
     @Override
diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/persistance/PersistenceThreadLauncher.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/persistance/PersistenceThreadLauncher.java
index b88982f5d..9d67e35e3 100644
--- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/persistance/PersistenceThreadLauncher.java
+++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/persistance/PersistenceThreadLauncher.java
@@ -7,7 +7,7 @@ public class PersistenceThreadLauncher {
     public static void doLaunch() {
         new RegisterPersistenceThread().start();
         for (int i = 0; i < Config.Server.MAX_DEAL_DATA_THREAD_NUMBER; i++) {
-            new PersistenceThread().start();
+            new PersistenceThread(i).start();
         }
     }
 }