kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
wusheng 2016-11-24 18:29:07 +08:00
parent d1431cad59
commit e750b540cc
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileLoader.java
View File

@ -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;
}

8
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/listener/StorageListener.java
View File

@ -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);
}
}
}