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

use disruptor to replace DataCarrier, to improve performance

This commit is contained in:
wusheng 2016-11-24 17:32:51 +08:00
parent c30a42346a
commit 9561a50f6d
13 changed files with 222 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
skywalking-storage-center/pom.xml
View File

@ -25,9 +25,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>data-carrier</artifactId>
<version>1.2</version>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>3.3.6</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>

4
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/config/Config.java
View File

@ -8,6 +8,10 @@ public class Config {
public static int PORT = 34000;
}
public static class Disruptor{
public static int BUFFER_SIZE = 1024 * 128;
}
public static class DataConsumer {

49
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/SpanDataConsumer.java
View File

@ -1,49 +0,0 @@
package com.a.eye.skywalking.storage.data;
import com.a.eye.datacarrier.consumer.IConsumer;
import com.a.eye.skywalking.health.report.HealthCollector;
import com.a.eye.skywalking.health.report.HeathReading;
import com.a.eye.skywalking.logging.api.ILog;
import com.a.eye.skywalking.logging.api.LogManager;
import com.a.eye.skywalking.storage.data.file.DataFileWriter;
import com.a.eye.skywalking.storage.data.index.IndexMetaCollection;
import com.a.eye.skywalking.storage.data.index.IndexOperator;
import com.a.eye.skywalking.storage.data.index.IndexOperatorFactory;
import com.a.eye.skywalking.storage.data.spandata.SpanData;
import java.util.List;
public class SpanDataConsumer implements IConsumer<SpanData> {
private static ILog logger = LogManager.getLogger(SpanDataConsumer.class);
private DataFileWriter fileWriter;
private IndexOperator operator;
@Override
public void init() {
fileWriter = new DataFileWriter();
operator = IndexOperatorFactory.createIndexOperator();
}
@Override
public void consume(List<SpanData> data) {
IndexMetaCollection collection = fileWriter.write(data);
operator.batchUpdate(collection);
HealthCollector.getCurrentHeathReading("SpanDataConsumer")
.updateData(HeathReading.INFO, "%s messages were successful consumed .", data.size());
}
@Override
public void onError(List<SpanData> span, Throwable throwable) {
logger.error("Failed to consumer span data.", throwable);
HealthCollector.getCurrentHeathReading("SpanDataConsumer").updateData(HeathReading.ERROR,
"Failed to consume span data. error message : " + throwable.getMessage());
}
@Override
public void onExit() {
fileWriter.close();
}
}

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

@ -1,6 +1,7 @@
package com.a.eye.skywalking.storage.data.file;
import com.a.eye.datacarrier.common.AtomicRangeInteger;
import com.a.eye.skywalking.storage.util.AtomicRangeInteger;
import java.text.ParseException;
import java.text.SimpleDateFormat;

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

@ -23,11 +23,14 @@ public class DataFileWriter {
for (SpanData data : spanData) {
collections.add(dataFile.write(data));
}
dataFile.flush();
return collections;
}
public void flush(){
dataFile.flush();
}
public void close(){
dataFile.close();
}

4
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/spandata/AckSpanData.java
View File

@ -16,6 +16,10 @@ public class AckSpanData extends AbstractSpanData {
public AckSpanData() {
}
public void setAckSpan(AckSpan ackSpan) {
this.ackSpan = ackSpan;
}
@Override
public SpanType getSpanType() {
return SpanType.ACKSpan;

4
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/spandata/RequestSpanData.java
View File

@ -16,6 +16,10 @@ public class RequestSpanData extends AbstractSpanData {
public RequestSpanData() {
}
public void setRequestSpan(RequestSpan requestSpan) {
this.requestSpan = requestSpan;
}
@Override
public SpanType getSpanType() {
return SpanType.RequestSpan;

14
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/disruptor/ack/AckSpanFactory.java Normal file
View File

@ -0,0 +1,14 @@
package com.a.eye.skywalking.storage.disruptor.ack;
import com.a.eye.skywalking.storage.data.spandata.AckSpanData;
import com.lmax.disruptor.EventFactory;
/**
* Created by wusheng on 2016/11/24.
*/
public class AckSpanFactory implements EventFactory<AckSpanData> {
@Override
public AckSpanData newInstance() {
return new AckSpanData();
}
}

45
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/disruptor/ack/StoreAckSpanEventHandler.java Normal file
View File

@ -0,0 +1,45 @@
package com.a.eye.skywalking.storage.disruptor.ack;
import com.a.eye.skywalking.health.report.HealthCollector;
import com.a.eye.skywalking.health.report.HeathReading;
import com.a.eye.skywalking.logging.api.ILog;
import com.a.eye.skywalking.logging.api.LogManager;
import com.a.eye.skywalking.storage.data.file.DataFileWriter;
import com.a.eye.skywalking.storage.data.index.IndexMetaCollection;
import com.a.eye.skywalking.storage.data.index.IndexOperator;
import com.a.eye.skywalking.storage.data.index.IndexOperatorFactory;
import com.a.eye.skywalking.storage.data.spandata.AckSpanData;
import com.a.eye.skywalking.storage.data.spandata.SpanData;
import com.lmax.disruptor.EventHandler;
import java.util.ArrayList;
import java.util.List;
/**
* Created by wusheng on 2016/11/24.
*/
public class StoreAckSpanEventHandler implements EventHandler<AckSpanData> {
private static ILog logger = LogManager.getLogger(StoreAckSpanEventHandler.class);
private DataFileWriter fileWriter;
private IndexOperator operator;
private int bufferSize = 100;
private List<SpanData> buffer = new ArrayList<>(bufferSize);
public StoreAckSpanEventHandler() {
fileWriter = new DataFileWriter();
operator = IndexOperatorFactory.createIndexOperator();
}
@Override
public void onEvent(AckSpanData event, long sequence, boolean endOfBatch) throws Exception {
buffer.add(event);
if (endOfBatch || buffer.size() == bufferSize) {
IndexMetaCollection collection = fileWriter.write(buffer);
operator.batchUpdate(collection);
HealthCollector.getCurrentHeathReading("StoreAckSpanEventHandler").updateData(HeathReading.INFO, "%s messages were successful consumed .", buffer.size());
}
}
}

14
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/disruptor/request/RequestSpanFactory.java Normal file
View File

@ -0,0 +1,14 @@
package com.a.eye.skywalking.storage.disruptor.request;
import com.a.eye.skywalking.storage.data.spandata.RequestSpanData;
import com.lmax.disruptor.EventFactory;
/**
* Created by wusheng on 2016/11/24.
*/
public class RequestSpanFactory implements EventFactory<RequestSpanData> {
@Override
public RequestSpanData newInstance() {
return new RequestSpanData();
}
}

45
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/disruptor/request/StoreRequestSpanEventHandler.java Normal file
View File

@ -0,0 +1,45 @@
package com.a.eye.skywalking.storage.disruptor.request;
import com.a.eye.skywalking.health.report.HealthCollector;
import com.a.eye.skywalking.health.report.HeathReading;
import com.a.eye.skywalking.logging.api.ILog;
import com.a.eye.skywalking.logging.api.LogManager;
import com.a.eye.skywalking.storage.data.file.DataFileWriter;
import com.a.eye.skywalking.storage.data.index.IndexMetaCollection;
import com.a.eye.skywalking.storage.data.index.IndexOperator;
import com.a.eye.skywalking.storage.data.index.IndexOperatorFactory;
import com.a.eye.skywalking.storage.data.spandata.RequestSpanData;
import com.a.eye.skywalking.storage.data.spandata.SpanData;
import com.lmax.disruptor.EventHandler;
import java.util.ArrayList;
import java.util.List;
/**
* Created by wusheng on 2016/11/24.
*/
public class StoreRequestSpanEventHandler implements EventHandler<RequestSpanData> {
private static ILog logger = LogManager.getLogger(StoreRequestSpanEventHandler.class);
private DataFileWriter fileWriter;
private IndexOperator operator;
private int bufferSize = 100;
private List<SpanData> buffer = new ArrayList<>(bufferSize);
public StoreRequestSpanEventHandler() {
fileWriter = new DataFileWriter();
operator = IndexOperatorFactory.createIndexOperator();
}
@Override
public void onEvent(RequestSpanData event, long sequence, boolean endOfBatch) throws Exception {
buffer.add(event);
if (endOfBatch || buffer.size() == bufferSize) {
IndexMetaCollection collection = fileWriter.write(buffer);
operator.batchUpdate(collection);
HealthCollector.getCurrentHeathReading("StoreRequestSpanEventHandler").updateData(HeathReading.INFO, "%s messages were successful consumed .", buffer.size());
}
}
}

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

@ -1,6 +1,5 @@
package com.a.eye.skywalking.storage.listener;
import com.a.eye.datacarrier.DataCarrier;
import com.a.eye.skywalking.health.report.HealthCollector;
import com.a.eye.skywalking.health.report.HeathReading;
import com.a.eye.skywalking.logging.api.ILog;
@ -9,32 +8,48 @@ import com.a.eye.skywalking.network.grpc.AckSpan;
import com.a.eye.skywalking.network.grpc.RequestSpan;
import com.a.eye.skywalking.network.listener.SpanStorageListener;
import com.a.eye.skywalking.storage.config.Config;
import com.a.eye.skywalking.storage.data.SpanDataConsumer;
import com.a.eye.skywalking.storage.data.spandata.SpanData;
import com.a.eye.skywalking.storage.data.spandata.SpanDataBuilder;
import com.a.eye.skywalking.storage.data.spandata.AckSpanData;
import com.a.eye.skywalking.storage.data.spandata.RequestSpanData;
import com.a.eye.skywalking.storage.disruptor.ack.AckSpanFactory;
import com.a.eye.skywalking.storage.disruptor.ack.StoreAckSpanEventHandler;
import com.a.eye.skywalking.storage.disruptor.request.RequestSpanFactory;
import com.a.eye.skywalking.storage.disruptor.request.StoreRequestSpanEventHandler;
import com.lmax.disruptor.RingBuffer;
import com.lmax.disruptor.dsl.Disruptor;
import com.lmax.disruptor.util.DaemonThreadFactory;
public class StorageListener implements SpanStorageListener {
private ILog logger = LogManager.getLogger(StorageListener.class);
private DataCarrier<SpanData> spanDataDataCarrier;
private Disruptor<RequestSpanData> requestSpanDisruptor;
private RingBuffer<RequestSpanData> requestSpanRingBuffer;
private Disruptor<AckSpanData> ackSpanDisruptor;
private RingBuffer<AckSpanData> ackSpanRingBuffer;
public StorageListener() {
spanDataDataCarrier = new DataCarrier<>(Config.DataConsumer.CHANNEL_SIZE, Config.DataConsumer.BUFFER_SIZE);
spanDataDataCarrier.consume(SpanDataConsumer.class, Config.DataConsumer.CONSUMER_SIZE);
requestSpanDisruptor = new Disruptor<RequestSpanData>(new RequestSpanFactory(), Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE);
requestSpanDisruptor.handleEventsWith(new StoreRequestSpanEventHandler());
requestSpanRingBuffer = requestSpanDisruptor.getRingBuffer();
ackSpanDisruptor = new Disruptor<AckSpanData>(new AckSpanFactory(), Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE);
ackSpanDisruptor.handleEventsWith(new StoreAckSpanEventHandler());
ackSpanRingBuffer = ackSpanDisruptor.getRingBuffer();
}
@Override
public boolean storage(RequestSpan requestSpan) {
try {
spanDataDataCarrier.produce(SpanDataBuilder.build(requestSpan));
HealthCollector.getCurrentHeathReading("StorageListener")
.updateData(HeathReading.INFO, "RequestSpan stored.");
long sequence = requestSpanRingBuffer.next(); // Grab the next sequence
RequestSpanData data = requestSpanRingBuffer.get(sequence);
data.setRequestSpan(requestSpan);
HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.INFO, "RequestSpan stored.");
return true;
} catch (Exception 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;
}
}
@ -42,13 +57,15 @@ public class StorageListener implements SpanStorageListener {
@Override
public boolean storage(AckSpan ackSpan) {
try {
spanDataDataCarrier.produce(SpanDataBuilder.build(ackSpan));
long sequence = ackSpanRingBuffer.next(); // Grab the next sequence
AckSpanData data = ackSpanRingBuffer.get(sequence);
data.setAckSpan(ackSpan);
HealthCollector.getCurrentHeathReading("StorageListener").updateData(HeathReading.INFO, "AckSpan stored.");
return true;
} catch (Exception 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;
}
}

51
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/util/AtomicRangeInteger.java Normal file
View File

@ -0,0 +1,51 @@
package com.a.eye.skywalking.storage.util;
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
/**
* Created by wusheng on 2016/10/25.
*/
public class AtomicRangeInteger extends Number implements Serializable {
private static final long serialVersionUID = -4099792402691141643L;
private AtomicInteger value;
private int startValue;
private int endValue;
public AtomicRangeInteger(int startValue, int maxValue) {
this.value = new AtomicInteger(startValue);
this.startValue = startValue;
this.endValue = maxValue - 1;
}
public final int getAndIncrement() {
int current;
int next;
do {
current = this.value.get();
next = current >= this.endValue?this.startValue:current + 1;
} while(!this.value.compareAndSet(current, next));
return current;
}
public final int get() {
return this.value.get();
}
public int intValue() {
return this.value.intValue();
}
public long longValue() {
return this.value.longValue();
}
public float floatValue() {
return this.value.floatValue();
}
public double doubleValue() {
return this.value.doubleValue();
}
}