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

Trace buffer test success. (#1733)

This commit is contained in:
彭勇升 pengys 2018-10-08 23:17:15 +08:00 committed by 吴晟 Wu Sheng
parent 46c55ebdb9
commit 065a384f10
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferStream.java
View File

@ -68,7 +68,7 @@ public class BufferStream<MESSAGE_TYPE extends GeneratedMessageV3> {
}
private void tryLock(File directory) {
logger.info("Try to lock buffer directory, directory is: " + absolutePath);
logger.info("Try to lock buffer directory, directory is: " + directory.getAbsolutePath());
FileLock lock = null;
try {
@ -78,10 +78,10 @@ public class BufferStream<MESSAGE_TYPE extends GeneratedMessageV3> {
}
if (lock == null) {
throw new RuntimeException("The buffer directory is reading or writing by another thread, directory is: " + absolutePath);
throw new RuntimeException("The buffer directory is reading or writing by another thread, directory is: " + directory.getAbsolutePath());
}
logger.info("Lock buffer directory successfully, directory is: " + absolutePath);
logger.info("Lock buffer directory successfully, directory is: " + directory.getAbsolutePath());
}
public static class Builder<MESSAGE_TYPE extends GeneratedMessageV3> {

29
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java
View File

@ -35,13 +35,11 @@ public class SegmentStandardizationWorker extends AbstractWorker<SegmentStandard
private static final Logger logger = LoggerFactory.getLogger(SegmentStandardizationWorker.class);
private final BufferStream<UpstreamSegment> stream;
private final DataCarrier<SegmentStandardization> dataCarrier;
public SegmentStandardizationWorker(SegmentParse segmentParse, String path,
int offsetFileMaxSize, int dataFileMaxSize, boolean cleanWhenRestart) throws IOException {
super(Integer.MAX_VALUE);
DataCarrier<SegmentStandardization> dataCarrier = new DataCarrier<>(1, 1024);
dataCarrier.consume(new Consumer(this), 1);
BufferStream.Builder<UpstreamSegment> builder = new BufferStream.Builder<>(path);
builder.cleanWhenRestart(cleanWhenRestart);
@ -50,21 +48,24 @@ public class SegmentStandardizationWorker extends AbstractWorker<SegmentStandard
builder.parser(UpstreamSegment.parser());
builder.callBack(segmentParse);
stream = builder.build();
BufferStream<UpstreamSegment> stream = builder.build();
stream.initialize();
dataCarrier = new DataCarrier<>(1, 1024);
dataCarrier.consume(new Consumer(stream), 1);
}
@Override
public void in(SegmentStandardization standardization) {
stream.write(standardization.getUpstreamSegment());
dataCarrier.produce(standardization);
}
private class Consumer implements IConsumer<SegmentStandardization> {
private final SegmentStandardizationWorker aggregator;
private final BufferStream<UpstreamSegment> stream;
private Consumer(SegmentStandardizationWorker aggregator) {
this.aggregator = aggregator;
private Consumer(BufferStream<UpstreamSegment> stream) {
this.stream = stream;
}
@Override
@ -73,16 +74,8 @@ public class SegmentStandardizationWorker extends AbstractWorker<SegmentStandard
@Override
public void consume(List<SegmentStandardization> data) {
Iterator<SegmentStandardization> inputIterator = data.iterator();
int i = 0;
while (inputIterator.hasNext()) {
SegmentStandardization indicator = inputIterator.next();
i++;
if (i == data.size()) {
indicator.getEndOfBatchContext().setEndOfBatch(true);
}
aggregator.in(indicator);
for (SegmentStandardization aData : data) {
stream.write(aData.getUpstreamSegment());
}
}

8
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/AgentDataMock.java
View File

@ -52,6 +52,14 @@ public class AgentDataMock {
UniqueId.Builder providerSegmentId = UniqueIdBuilder.INSTANCE.create();
providerMock.mock(streamObserver, globalTraceId, providerSegmentId, consumerSegmentId, startTimestamp, true);
TimeUnit.SECONDS.sleep(10);
globalTraceId = UniqueIdBuilder.INSTANCE.create();
consumerSegmentId = UniqueIdBuilder.INSTANCE.create();
providerSegmentId = UniqueIdBuilder.INSTANCE.create();
consumerMock.mock(streamObserver, globalTraceId, consumerSegmentId, startTimestamp, false);
providerMock.mock(streamObserver, globalTraceId, providerSegmentId, consumerSegmentId, startTimestamp, false);
streamObserver.onCompleted();
while (!IS_COMPLETED) {
TimeUnit.MILLISECONDS.sleep(500);