提交 e750b540 编写于 作者: wu-sheng's avatar wu-sheng

fix: 1.disruptor not start. 2.init data file from an empty dir failure.

上级 d1431cad
...@@ -21,7 +21,8 @@ public class DataFileLoader { ...@@ -21,7 +21,8 @@ public class DataFileLoader {
List<DataFile> allDataFile = new ArrayList<DataFile>(); List<DataFile> allDataFile = new ArrayList<DataFile>();
for (File fileEntry : dataFileDir.listFiles()) { for (File fileEntry : dataFileDir.listFiles()) {
allDataFile.add(new DataFile(fileEntry)); if (fileEntry.getName().split("_").length == 8)
allDataFile.add(new DataFile(fileEntry));
} }
return allDataFile; return allDataFile;
} }
......
...@@ -31,10 +31,12 @@ public class StorageListener implements SpanStorageListener { ...@@ -31,10 +31,12 @@ public class StorageListener implements SpanStorageListener {
public StorageListener() { public StorageListener() {
requestSpanDisruptor = new Disruptor<RequestSpanData>(new RequestSpanFactory(), Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE); requestSpanDisruptor = new Disruptor<RequestSpanData>(new RequestSpanFactory(), Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE);
requestSpanDisruptor.handleEventsWith(new StoreRequestSpanEventHandler()); requestSpanDisruptor.handleEventsWith(new StoreRequestSpanEventHandler());
requestSpanDisruptor.start();
requestSpanRingBuffer = requestSpanDisruptor.getRingBuffer(); requestSpanRingBuffer = requestSpanDisruptor.getRingBuffer();
ackSpanDisruptor = new Disruptor<AckSpanData>(new AckSpanFactory(), Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE); ackSpanDisruptor = new Disruptor<AckSpanData>(new AckSpanFactory(), Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE);
ackSpanDisruptor.handleEventsWith(new StoreAckSpanEventHandler()); ackSpanDisruptor.handleEventsWith(new StoreAckSpanEventHandler());
ackSpanDisruptor.start();
ackSpanRingBuffer = ackSpanDisruptor.getRingBuffer(); ackSpanRingBuffer = ackSpanDisruptor.getRingBuffer();
} }
...@@ -51,7 +53,7 @@ public class StorageListener implements SpanStorageListener { ...@@ -51,7 +53,7 @@ public class StorageListener implements SpanStorageListener {
logger.error("RequestSpan trace-id[{}] store failure..", requestSpan.getTraceId(), e); logger.error("RequestSpan trace-id[{}] store failure..", requestSpan.getTraceId(), e);
HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.ERROR, "RequestSpan store failure."); HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.ERROR, "RequestSpan store failure.");
return false; return false;
} finally{ } finally {
requestSpanRingBuffer.publish(sequence); requestSpanRingBuffer.publish(sequence);
} }
} }
...@@ -69,8 +71,8 @@ public class StorageListener implements SpanStorageListener { ...@@ -69,8 +71,8 @@ public class StorageListener implements SpanStorageListener {
logger.error("AckSpan trace-id[{}] store failure..", ackSpan.getTraceId(), e); logger.error("AckSpan trace-id[{}] store failure..", ackSpan.getTraceId(), e);
HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.ERROR, "AckSpan store failure."); HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.ERROR, "AckSpan store failure.");
return false; return false;
} finally{ } finally {
requestSpanRingBuffer.publish(sequence); ackSpanRingBuffer.publish(sequence);
} }
} }
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册