From e750b540ccd6a0583b39fd91b5874aedae55f191 Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Thu, 24 Nov 2016 18:29:07 +0800
Subject: [PATCH] fix: 1.disruptor not start. 2.init data file from an empty
 dir failure.

---
 .../eye/skywalking/storage/data/file/DataFileLoader.java  | 3 ++-
 .../eye/skywalking/storage/listener/StorageListener.java  | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileLoader.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileLoader.java
index 1fd7971bd..feac53fac 100644
--- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileLoader.java
+++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileLoader.java
@@ -21,7 +21,8 @@ public class DataFileLoader {
 
         List<DataFile> allDataFile = new ArrayList<DataFile>();
         for (File fileEntry : dataFileDir.listFiles()) {
-            allDataFile.add(new DataFile(fileEntry));
+            if (fileEntry.getName().split("_").length == 8)
+                allDataFile.add(new DataFile(fileEntry));
         }
         return allDataFile;
     }
diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/listener/StorageListener.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/listener/StorageListener.java
index 15b997693..eceede1ea 100644
--- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/listener/StorageListener.java
+++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/listener/StorageListener.java
@@ -31,10 +31,12 @@ public class StorageListener implements SpanStorageListener {
     public StorageListener() {
         requestSpanDisruptor = new Disruptor<RequestSpanData>(new RequestSpanFactory(), Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE);
         requestSpanDisruptor.handleEventsWith(new StoreRequestSpanEventHandler());
+        requestSpanDisruptor.start();
         requestSpanRingBuffer = requestSpanDisruptor.getRingBuffer();
 
         ackSpanDisruptor = new Disruptor<AckSpanData>(new AckSpanFactory(), Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE);
         ackSpanDisruptor.handleEventsWith(new StoreAckSpanEventHandler());
+        ackSpanDisruptor.start();
         ackSpanRingBuffer = ackSpanDisruptor.getRingBuffer();
     }
 
@@ -51,7 +53,7 @@ public class StorageListener implements SpanStorageListener {
             logger.error("RequestSpan trace-id[{}] store failure..", requestSpan.getTraceId(), e);
             HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.ERROR, "RequestSpan store failure.");
             return false;
-        } finally{
+        } finally {
             requestSpanRingBuffer.publish(sequence);
         }
     }
@@ -69,8 +71,8 @@ public class StorageListener implements SpanStorageListener {
             logger.error("AckSpan trace-id[{}] store failure..", ackSpan.getTraceId(), e);
             HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.ERROR, "AckSpan store failure.");
             return false;
-        } finally{
-            requestSpanRingBuffer.publish(sequence);
+        } finally {
+            ackSpanRingBuffer.publish(sequence);
         }
     }
 }
-- 
GitLab