Backend streaming thread model improvement (#2247)

[Performance Improvement]Backend streaming thread model improvement
This commit is contained in:
吴晟 Wu Sheng 2019-02-18 14:55:07 +08:00 committed by GitHub
parent 19614a18a1
commit 2f3ccf368c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 455 additions and 26 deletions

0
.mvn/wrapper/MavenWrapperDownloader.java vendored Executable file → Normal file
View File

0
.mvn/wrapper/maven-wrapper.properties vendored Executable file → Normal file
View File

View File

@ -18,8 +18,7 @@
package org.apache.skywalking.apm.commons.datacarrier.buffer; package org.apache.skywalking.apm.commons.datacarrier.buffer;
import java.util.LinkedList; import java.util.*;
import java.util.List;
import org.apache.skywalking.apm.commons.datacarrier.callback.QueueBlockingCallback; import org.apache.skywalking.apm.commons.datacarrier.callback.QueueBlockingCallback;
import org.apache.skywalking.apm.commons.datacarrier.common.AtomicRangeInteger; import org.apache.skywalking.apm.commons.datacarrier.common.AtomicRangeInteger;
@ -80,6 +79,10 @@ public class Buffer<T> {
return buffer.length; return buffer.length;
} }
public LinkedList<T> obtain() {
return this.obtain(0, buffer.length);
}
public LinkedList<T> obtain(int start, int end) { public LinkedList<T> obtain(int start, int end) {
LinkedList<T> result = new LinkedList<T>(); LinkedList<T> result = new LinkedList<T>();
for (int i = start; i < end; i++) { for (int i = start; i < end; i++) {

View File

@ -81,6 +81,14 @@ public class Channels<T> {
return this.bufferChannels.length; return this.bufferChannels.length;
} }
public int getBufferSize() {
return bufferChannels[0].getBufferSize();
}
public long size() {
return (long)getChannelSize() * getBufferSize();
}
public Buffer<T> getBuffer(int index) { public Buffer<T> getBuffer(int index) {
return this.bufferChannels[index]; return this.bufferChannels[index];
} }

View File

@ -0,0 +1,125 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.skywalking.apm.commons.datacarrier.consumer;
import java.util.*;
import java.util.concurrent.Callable;
import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels;
/**
* BulkConsumePool works for consuming data from multiple channels(DataCarrier instances), with multiple {@link
* MultipleChannelsConsumer}s.
*
* In typical case, the number of {@link MultipleChannelsConsumer} should be less than the number of channels.
*
* @author wusheng
*/
public class BulkConsumePool implements ConsumerPool {
private List<MultipleChannelsConsumer> allConsumers;
private volatile boolean isStarted = false;
public BulkConsumePool(String name, int size, long consumeCycle) {
allConsumers = new ArrayList<MultipleChannelsConsumer>(size);
String threadNum = System.getenv(name + "_THREAD");
if (threadNum != null) {
try {
size = Integer.parseInt(threadNum);
} catch (NumberFormatException e) {
}
}
for (int i = 0; i < size; i++) {
MultipleChannelsConsumer multipleChannelsConsumer = new MultipleChannelsConsumer("DataCarrier." + name + ".BulkConsumePool." + i + ".Thread", consumeCycle);
multipleChannelsConsumer.setDaemon(true);
allConsumers.add(multipleChannelsConsumer);
}
}
@Override synchronized public void add(String name, Channels channels, IConsumer consumer) {
MultipleChannelsConsumer multipleChannelsConsumer = getLowestPayload();
multipleChannelsConsumer.addNewTarget(channels, consumer);
}
/**
* Get the lowest payload consumer thread based on current allocate status.
*
* @return the lowest consumer.
*/
private MultipleChannelsConsumer getLowestPayload() {
MultipleChannelsConsumer winner = allConsumers.get(0);
for (int i = 1; i < allConsumers.size(); i++) {
MultipleChannelsConsumer option = allConsumers.get(i);
if (option.size() < winner.size()) {
return option;
}
}
return winner;
}
/**
* @param channels
* @return
*/
@Override public boolean isRunning(Channels channels) {
return isStarted;
}
@Override public void close(Channels channels) {
for (MultipleChannelsConsumer consumer : allConsumers) {
consumer.shutdown();
}
}
@Override public void begin(Channels channels) {
if (isStarted) {
return;
}
for (MultipleChannelsConsumer consumer : allConsumers) {
consumer.start();
}
isStarted = true;
}
/**
* The creator for {@link BulkConsumePool}.
*/
public static class Creator implements Callable<ConsumerPool> {
private String name;
private int size;
private long consumeCycle;
public Creator(String name, int poolSize, long consumeCycle) {
this.name = name;
this.size = poolSize;
this.consumeCycle = consumeCycle;
}
@Override public ConsumerPool call() {
return new BulkConsumePool(name, size, consumeCycle);
}
public static int recommendMaxSize() {
int processorNum = Runtime.getRuntime().availableProcessors();
if (processorNum > 1) {
processorNum -= 1;
}
return processorNum;
}
}
}

View File

@ -63,9 +63,13 @@ public enum ConsumerPoolFactory {
} }
} }
/**
* Always return true.
* @param channels
* @return
*/
@Override public boolean isRunning(Channels channels) { @Override public boolean isRunning(Channels channels) {
ConsumeDriver driver = allDrivers.get(channels); return true;
return driver == null ? false : driver.isRunning(channels);
} }
@Override public void close(Channels channels) { @Override public void close(Channels channels) {

View File

@ -0,0 +1,124 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.skywalking.apm.commons.datacarrier.consumer;
import java.util.*;
import org.apache.skywalking.apm.commons.datacarrier.buffer.*;
/**
* MultipleChannelsConsumer represent a single consumer thread, but support multiple channels with their {@link
* IConsumer}s
*
* @author wusheng
*/
public class MultipleChannelsConsumer extends Thread {
private volatile boolean running;
private volatile ArrayList<Group> consumeTargets;
private volatile long size;
private final long consumeCycle;
public MultipleChannelsConsumer(String threadName, long consumeCycle) {
super(threadName);
this.consumeTargets = new ArrayList<Group>();
this.consumeCycle = consumeCycle;
}
@Override
public void run() {
running = true;
while (running) {
boolean hasData = false;
for (Group target : consumeTargets) {
hasData = hasData || consume(target);
}
if (!hasData) {
try {
Thread.sleep(consumeCycle);
} catch (InterruptedException e) {
}
}
}
// consumer thread is going to stop
// consume the last time
for (Group target : consumeTargets) {
consume(target);
target.consumer.onExit();
}
}
private boolean consume(Group target) {
boolean hasData;
LinkedList consumeList = new LinkedList();
for (int i = 0; i < target.channels.getChannelSize(); i++) {
Buffer buffer = target.channels.getBuffer(i);
consumeList.addAll(buffer.obtain());
}
hasData = consumeList.size() > 0;
if (consumeList.size() > 0) {
try {
target.consumer.consume(consumeList);
} catch (Throwable t) {
target.consumer.onError(consumeList, t);
}
}
return hasData;
}
/**
* Add a new target channels.
*
* @param channels
* @param consumer
*/
public void addNewTarget(Channels channels, IConsumer consumer) {
Group group = new Group(channels, consumer);
// Recreate the new list to avoid change list while the list is used in consuming.
ArrayList<Group> newList = new ArrayList<Group>();
for (Group target : consumeTargets) {
newList.add(target);
}
newList.add(group);
consumeTargets = newList;
size += channels.size();
}
public long size() {
return size;
}
void shutdown() {
running = false;
}
private class Group {
private Channels channels;
private IConsumer consumer;
public Group(Channels channels, IConsumer consumer) {
this.channels = channels;
this.consumer = consumer;
}
}
}

View File

@ -0,0 +1,91 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.skywalking.apm.commons.datacarrier.consumer;
import java.util.*;
import org.apache.skywalking.apm.commons.datacarrier.buffer.*;
import org.apache.skywalking.apm.commons.datacarrier.partition.SimpleRollingPartitioner;
import org.junit.*;
/**
* @author wusheng
*/
public class BulkConsumePoolTest {
@Test
public void testOneThreadPool() throws InterruptedException {
BulkConsumePool pool = new BulkConsumePool("testPool", 1, 50);
final ArrayList<Object> result1 = new ArrayList();
Channels c1 = new Channels(2, 10, new SimpleRollingPartitioner(), BufferStrategy.OVERRIDE);
pool.add("test", c1,
new IConsumer() {
@Override public void init() {
}
@Override public void consume(List data) {
for (Object datum : data) {
result1.add(datum);
}
}
@Override public void onError(List data, Throwable t) {
}
@Override public void onExit() {
}
});
pool.begin(c1);
final ArrayList<Object> result2 = new ArrayList();
Channels c2 = new Channels(2, 10, new SimpleRollingPartitioner(), BufferStrategy.OVERRIDE);
pool.add("test2", c2,
new IConsumer() {
@Override public void init() {
}
@Override public void consume(List data) {
for (Object datum : data) {
result2.add(datum);
}
}
@Override public void onError(List data, Throwable t) {
}
@Override public void onExit() {
}
});
pool.begin(c2);
c1.save(new Object());
c1.save(new Object());
c1.save(new Object());
c1.save(new Object());
c1.save(new Object());
c2.save(new Object());
c2.save(new Object());
Thread.sleep(2000);
Assert.assertEquals(5, result1.size());
Assert.assertEquals(2, result2.size());
}
}

View File

@ -75,7 +75,7 @@ receiver-trace:
bufferDataMaxFileSize: ${SW_RECEIVER_BUFFER_DATA_MAX_FILE_SIZE:500} # Unit is MB bufferDataMaxFileSize: ${SW_RECEIVER_BUFFER_DATA_MAX_FILE_SIZE:500} # Unit is MB
bufferFileCleanWhenRestart: ${SW_RECEIVER_BUFFER_FILE_CLEAN_WHEN_RESTART:false} bufferFileCleanWhenRestart: ${SW_RECEIVER_BUFFER_FILE_CLEAN_WHEN_RESTART:false}
sampleRate: ${SW_TRACE_SAMPLE_RATE:10000} # The sample rate precision is 1/10000. 10000 means 100% sample in default. sampleRate: ${SW_TRACE_SAMPLE_RATE:10000} # The sample rate precision is 1/10000. 10000 means 100% sample in default.
slowDBAccessThreshold: ${SW_SLOW_DB_THRESHOLD:default:200,redis:50} # The slow database access thresholds. Unit ms. slowDBAccessThreshold: ${SW_SLOW_DB_THRESHOLD:default:200,mongodb:100} # The slow database access thresholds. Unit ms.
receiver-jvm: receiver-jvm:
default: default:
service-mesh: service-mesh:

View File

@ -64,6 +64,6 @@
* [GSON](https://github.com/google/gson) 2.8.x (Optional²) * [GSON](https://github.com/google/gson) 2.8.x (Optional²)
¹Due to license incompatibilities/restrictions these plugins are hosted and released in 3rd part repository, ¹Due to license incompatibilities/restrictions these plugins are hosted and released in 3rd part repository,
go to [OpenSkywalking java plugin extension repository](https://github.com/OpenSkywalking/java-plugin-extensions) to get these. go to [SkyAPM java plugin extension repository](https://github.com/SkyAPM/java-plugin-extensions) to get these.
²These plugins affect the performance or must be used under some conditions, from experiences. So only released in `/optional-plugins`, copy to `/plugins` in order to make them work. ²These plugins affect the performance or must be used under some conditions, from experiences. So only released in `/optional-plugins`, copy to `/plugins` in order to make them work.

View File

@ -30,6 +30,7 @@ public class CoreModuleConfig extends ModuleConfig {
@Setter private String nameSpace; @Setter private String nameSpace;
@Setter private String restHost; @Setter private String restHost;
@Setter private int restPort; @Setter private int restPort;
@Setter private int jettySelectors = 1;
@Setter private String restContextPath; @Setter private String restContextPath;
@Setter private String gRPCHost; @Setter private String gRPCHost;
@Setter private int gRPCPort; @Setter private int gRPCPort;

View File

@ -95,7 +95,7 @@ public class CoreModuleProvider extends ModuleProvider {
} }
grpcServer.initialize(); grpcServer.initialize();
jettyServer = new JettyServer(moduleConfig.getRestHost(), moduleConfig.getRestPort(), moduleConfig.getRestContextPath()); jettyServer = new JettyServer(moduleConfig.getRestHost(), moduleConfig.getRestPort(), moduleConfig.getRestContextPath(), moduleConfig.getJettySelectors());
jettyServer.initialize(); jettyServer.initialize();
this.registerServiceImplementation(DownsamplingConfigService.class, new DownsamplingConfigService(moduleConfig.getDownsampling())); this.registerServiceImplementation(DownsamplingConfigService.class, new DownsamplingConfigService(moduleConfig.getDownsampling()));

View File

@ -25,4 +25,8 @@ public class UnexpectedException extends RuntimeException {
public UnexpectedException(String message) { public UnexpectedException(String message) {
super(message); super(message);
} }
public UnexpectedException(String message, Exception cause) {
super(message, cause);
}
} }

View File

@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
import org.apache.skywalking.apm.commons.datacarrier.consumer.*; import org.apache.skywalking.apm.commons.datacarrier.consumer.*;
import org.apache.skywalking.oap.server.core.UnexpectedException;
import org.apache.skywalking.oap.server.core.analysis.data.EndOfBatchContext; import org.apache.skywalking.oap.server.core.analysis.data.EndOfBatchContext;
import org.apache.skywalking.oap.server.core.analysis.data.MergeDataCache; import org.apache.skywalking.oap.server.core.analysis.data.MergeDataCache;
import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator; import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator;
@ -53,7 +54,14 @@ public class IndicatorAggregateWorker extends AbstractWorker<Indicator> {
this.mergeDataCache = new MergeDataCache<>(); this.mergeDataCache = new MergeDataCache<>();
this.dataCarrier = new DataCarrier<>("IndicatorAggregateWorker." + modelName, 1, 10000); this.dataCarrier = new DataCarrier<>("IndicatorAggregateWorker." + modelName, 1, 10000);
this.dataCarrier.consume(ConsumerPoolFactory.DEFAULT_POOL, new AggregatorConsumer(this)); String name = "INDICATOR_L1_AGGREGATION";
BulkConsumePool.Creator creator = new BulkConsumePool.Creator(name, BulkConsumePool.Creator.recommendMaxSize(), 20);
try {
ConsumerPoolFactory.INSTANCE.createIfAbsent(name, creator);
} catch (Exception e) {
throw new UnexpectedException(e.getMessage(), e);
}
this.dataCarrier.consume(ConsumerPoolFactory.INSTANCE.get(name), new AggregatorConsumer(this));
MetricCreator metricCreator = moduleManager.find(TelemetryModule.NAME).provider().getService(MetricCreator.class); MetricCreator metricCreator = moduleManager.find(TelemetryModule.NAME).provider().getService(MetricCreator.class);
aggregationCounter = metricCreator.createCounter("indicator_aggregation", "The number of rows in aggregation", aggregationCounter = metricCreator.createCounter("indicator_aggregation", "The number of rows in aggregation",

View File

@ -24,6 +24,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
import org.apache.skywalking.apm.commons.datacarrier.consumer.*; import org.apache.skywalking.apm.commons.datacarrier.consumer.*;
import org.apache.skywalking.oap.server.core.UnexpectedException;
import org.apache.skywalking.oap.server.core.analysis.data.EndOfBatchContext; import org.apache.skywalking.oap.server.core.analysis.data.EndOfBatchContext;
import org.apache.skywalking.oap.server.core.analysis.data.MergeDataCache; import org.apache.skywalking.oap.server.core.analysis.data.MergeDataCache;
import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator; import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator;
@ -55,9 +56,21 @@ public class IndicatorPersistentWorker extends PersistenceWorker<Indicator, Merg
this.mergeDataCache = new MergeDataCache<>(); this.mergeDataCache = new MergeDataCache<>();
this.indicatorDAO = indicatorDAO; this.indicatorDAO = indicatorDAO;
this.nextWorker = nextWorker; this.nextWorker = nextWorker;
this.dataCarrier = new DataCarrier<>("IndicatorPersistentWorker." + modelName, 1, 10000);
this.dataCarrier.consume(ConsumerPoolFactory.DEFAULT_POOL, new PersistentConsumer(this)); String name = "INDICATOR_L2_AGGREGATION";
int size = BulkConsumePool.Creator.recommendMaxSize() / 4;
if (size == 0) {
size = 1;
}
BulkConsumePool.Creator creator = new BulkConsumePool.Creator(name, size, 20);
try {
ConsumerPoolFactory.INSTANCE.createIfAbsent(name, creator);
} catch (Exception e) {
throw new UnexpectedException(e.getMessage(), e);
}
this.dataCarrier = new DataCarrier<>("IndicatorPersistentWorker." + modelName, 1, 2000);
this.dataCarrier.consume(ConsumerPoolFactory.INSTANCE.get(name), new PersistentConsumer(this));
} }
@Override void onWork(Indicator indicator) { @Override void onWork(Indicator indicator) {

View File

@ -20,7 +20,8 @@ package org.apache.skywalking.oap.server.core.analysis.worker;
import java.util.*; import java.util.*;
import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; import org.apache.skywalking.apm.commons.datacarrier.consumer.*;
import org.apache.skywalking.oap.server.core.UnexpectedException;
import org.apache.skywalking.oap.server.core.analysis.data.NonMergeDataCache; import org.apache.skywalking.oap.server.core.analysis.data.NonMergeDataCache;
import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.analysis.record.Record;
import org.apache.skywalking.oap.server.core.storage.IRecordDAO; import org.apache.skywalking.oap.server.core.storage.IRecordDAO;
@ -45,8 +46,17 @@ public class RecordPersistentWorker extends PersistenceWorker<Record, NonMergeDa
this.modelName = modelName; this.modelName = modelName;
this.nonMergeDataCache = new NonMergeDataCache<>(); this.nonMergeDataCache = new NonMergeDataCache<>();
this.recordDAO = recordDAO; this.recordDAO = recordDAO;
String name = "RECORD_PERSISTENT";
BulkConsumePool.Creator creator = new BulkConsumePool.Creator(name, 1, 20);
try {
ConsumerPoolFactory.INSTANCE.createIfAbsent(name, creator);
} catch (Exception e) {
throw new UnexpectedException(e.getMessage(), e);
}
this.dataCarrier = new DataCarrier<>(1, 10000); this.dataCarrier = new DataCarrier<>(1, 10000);
this.dataCarrier.consume(new RecordPersistentWorker.PersistentConsumer(this), 1); this.dataCarrier.consume(ConsumerPoolFactory.INSTANCE.get(name), new RecordPersistentWorker.PersistentConsumer(this));
} }
@Override public void in(Record record) { @Override public void in(Record record) {

View File

@ -48,7 +48,7 @@ public class TopNWorker extends PersistenceWorker<TopN, LimitedSizeDataCache<Top
this.limitedSizeDataCache = new LimitedSizeDataCache<>(topNSize); this.limitedSizeDataCache = new LimitedSizeDataCache<>(topNSize);
this.recordDAO = recordDAO; this.recordDAO = recordDAO;
this.modelName = modelName; this.modelName = modelName;
this.dataCarrier = new DataCarrier<>(1, 10000); this.dataCarrier = new DataCarrier<>("TopNWorker", 1, 1000);
this.dataCarrier.consume(new TopNWorker.TopNConsumer(), 1); this.dataCarrier.consume(new TopNWorker.TopNConsumer(), 1);
this.lastReportTimestamp = System.currentTimeMillis(); this.lastReportTimestamp = System.currentTimeMillis();
// Top N persistent only works per 10 minutes. // Top N persistent only works per 10 minutes.

View File

@ -20,7 +20,8 @@ package org.apache.skywalking.oap.server.core.register.worker;
import java.util.*; import java.util.*;
import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; import org.apache.skywalking.apm.commons.datacarrier.consumer.*;
import org.apache.skywalking.oap.server.core.UnexpectedException;
import org.apache.skywalking.oap.server.core.analysis.data.EndOfBatchContext; import org.apache.skywalking.oap.server.core.analysis.data.EndOfBatchContext;
import org.apache.skywalking.oap.server.core.register.RegisterSource; import org.apache.skywalking.oap.server.core.register.RegisterSource;
import org.apache.skywalking.oap.server.core.worker.AbstractWorker; import org.apache.skywalking.oap.server.core.worker.AbstractWorker;
@ -42,8 +43,15 @@ public class RegisterDistinctWorker extends AbstractWorker<RegisterSource> {
super(workerId); super(workerId);
this.nextWorker = nextWorker; this.nextWorker = nextWorker;
this.sources = new HashMap<>(); this.sources = new HashMap<>();
this.dataCarrier = new DataCarrier<>(1, 10000); this.dataCarrier = new DataCarrier<>(1, 1000);
this.dataCarrier.consume(new AggregatorConsumer(this), 1, 200); String name = "REGISTER_L1";
BulkConsumePool.Creator creator = new BulkConsumePool.Creator(name, 1, 200);
try {
ConsumerPoolFactory.INSTANCE.createIfAbsent(name, creator);
} catch (Exception e) {
throw new UnexpectedException(e.getMessage(), e);
}
this.dataCarrier.consume(ConsumerPoolFactory.INSTANCE.get(name), new AggregatorConsumer(this));
} }
@Override public final void in(RegisterSource source) { @Override public final void in(RegisterSource source) {

View File

@ -20,8 +20,8 @@ package org.apache.skywalking.oap.server.core.register.worker;
import java.util.*; import java.util.*;
import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; import org.apache.skywalking.apm.commons.datacarrier.consumer.*;
import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.*;
import org.apache.skywalking.oap.server.core.analysis.data.EndOfBatchContext; import org.apache.skywalking.oap.server.core.analysis.data.EndOfBatchContext;
import org.apache.skywalking.oap.server.core.register.RegisterSource; import org.apache.skywalking.oap.server.core.register.RegisterSource;
import org.apache.skywalking.oap.server.core.source.Scope; import org.apache.skywalking.oap.server.core.source.Scope;
@ -52,8 +52,17 @@ public class RegisterPersistentWorker extends AbstractWorker<RegisterSource> {
this.registerDAO = registerDAO; this.registerDAO = registerDAO;
this.registerLockDAO = moduleManager.find(StorageModule.NAME).provider().getService(IRegisterLockDAO.class); this.registerLockDAO = moduleManager.find(StorageModule.NAME).provider().getService(IRegisterLockDAO.class);
this.scope = scope; this.scope = scope;
this.dataCarrier = new DataCarrier<>("IndicatorPersistentWorker." + modelName, 1, 10000); this.dataCarrier = new DataCarrier<>("IndicatorPersistentWorker." + modelName, 1, 1000);
this.dataCarrier.consume(new RegisterPersistentWorker.PersistentConsumer(this), 1, 200);
String name = "REGISTER_L2";
BulkConsumePool.Creator creator = new BulkConsumePool.Creator(name, 1, 200);
try {
ConsumerPoolFactory.INSTANCE.createIfAbsent(name, creator);
} catch (Exception e) {
throw new UnexpectedException(e.getMessage(), e);
}
this.dataCarrier.consume(ConsumerPoolFactory.INSTANCE.get(name), new RegisterPersistentWorker.PersistentConsumer(this));
} }
@Override public final void in(RegisterSource registerSource) { @Override public final void in(RegisterSource registerSource) {

View File

@ -18,10 +18,12 @@
package org.apache.skywalking.oap.server.library.server.jetty; package org.apache.skywalking.oap.server.library.server.jetty;
import java.net.InetSocketAddress;
import java.util.Objects; import java.util.Objects;
import org.apache.skywalking.oap.server.library.server.Server;
import org.apache.skywalking.oap.server.library.server.*; import org.apache.skywalking.oap.server.library.server.*;
import org.eclipse.jetty.server.*;
import org.eclipse.jetty.servlet.*; import org.eclipse.jetty.servlet.*;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.slf4j.*; import org.slf4j.*;
/** /**
@ -34,13 +36,19 @@ public class JettyServer implements Server {
private final String host; private final String host;
private final int port; private final int port;
private final String contextPath; private final String contextPath;
private final int selectorNum;
private org.eclipse.jetty.server.Server server; private org.eclipse.jetty.server.Server server;
private ServletContextHandler servletContextHandler; private ServletContextHandler servletContextHandler;
public JettyServer(String host, int port, String contextPath) { public JettyServer(String host, int port, String contextPath) {
this(host, port, contextPath, -1);
}
public JettyServer(String host, int port, String contextPath, int selectorNum) {
this.host = host; this.host = host;
this.port = port; this.port = port;
this.contextPath = contextPath; this.contextPath = contextPath;
this.selectorNum = selectorNum;
} }
@Override @Override
@ -55,7 +63,20 @@ public class JettyServer implements Server {
@Override @Override
public void initialize() { public void initialize() {
server = new org.eclipse.jetty.server.Server(new InetSocketAddress(host, port)); QueuedThreadPool threadPool = new QueuedThreadPool();
if (selectorNum > 0) {
threadPool.setMaxThreads(selectorNum * 2 + 2);
}
server = new org.eclipse.jetty.server.Server(threadPool);
HttpConfiguration httpConfig = new HttpConfiguration();
ServerConnector http = new ServerConnector(server, null, null, null,
1, selectorNum, new HttpConnectionFactory(httpConfig));
http.setPort(port);
http.setHost(host);
server.addConnector(http);
servletContextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); servletContextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
servletContextHandler.setContextPath(contextPath); servletContextHandler.setContextPath(contextPath);

View File

@ -56,8 +56,8 @@ public class SegmentStandardizationWorker extends AbstractWorker<SegmentStandard
BufferStream<UpstreamSegment> stream = builder.build(); BufferStream<UpstreamSegment> stream = builder.build();
stream.initialize(); stream.initialize();
dataCarrier = new DataCarrier<>(1, 1024); dataCarrier = new DataCarrier<>("SegmentStandardizationWorker", 1, 1024);
dataCarrier.consume(new Consumer(stream), 1); dataCarrier.consume(new Consumer(stream), 1, 200);
MetricCreator metricCreator = moduleManager.find(TelemetryModule.NAME).provider().getService(MetricCreator.class); MetricCreator metricCreator = moduleManager.find(TelemetryModule.NAME).provider().getService(MetricCreator.class);
String metricNamePrefix = isV6 ? "v6_" : "v5_"; String metricNamePrefix = isV6 ? "v6_" : "v5_";

View File

@ -75,7 +75,7 @@ receiver-trace:
bufferDataMaxFileSize: ${SW_RECEIVER_BUFFER_DATA_MAX_FILE_SIZE:500} # Unit is MB bufferDataMaxFileSize: ${SW_RECEIVER_BUFFER_DATA_MAX_FILE_SIZE:500} # Unit is MB
bufferFileCleanWhenRestart: ${SW_RECEIVER_BUFFER_FILE_CLEAN_WHEN_RESTART:false} bufferFileCleanWhenRestart: ${SW_RECEIVER_BUFFER_FILE_CLEAN_WHEN_RESTART:false}
sampleRate: ${SW_TRACE_SAMPLE_RATE:10000} # The sample rate precision is 1/10000. 10000 means 100% sample in default. sampleRate: ${SW_TRACE_SAMPLE_RATE:10000} # The sample rate precision is 1/10000. 10000 means 100% sample in default.
slowDBAccessThreshold: ${SW_SLOW_DB_THRESHOLD:default:200,redis:50} # The slow database access thresholds. Unit ms. slowDBAccessThreshold: ${SW_SLOW_DB_THRESHOLD:default:200,mongodb:100} # The slow database access thresholds. Unit ms.
receiver-jvm: receiver-jvm:
default: default:
#service-mesh: #service-mesh:

View File

@ -75,7 +75,7 @@ receiver-trace:
bufferDataMaxFileSize: ${SW_RECEIVER_BUFFER_DATA_MAX_FILE_SIZE:500} # Unit is MB bufferDataMaxFileSize: ${SW_RECEIVER_BUFFER_DATA_MAX_FILE_SIZE:500} # Unit is MB
bufferFileCleanWhenRestart: ${SW_RECEIVER_BUFFER_FILE_CLEAN_WHEN_RESTART:false} bufferFileCleanWhenRestart: ${SW_RECEIVER_BUFFER_FILE_CLEAN_WHEN_RESTART:false}
sampleRate: ${SW_TRACE_SAMPLE_RATE:10000} # The sample rate precision is 1/10000. 10000 means 100% sample in default. sampleRate: ${SW_TRACE_SAMPLE_RATE:10000} # The sample rate precision is 1/10000. 10000 means 100% sample in default.
slowDBAccessThreshold: ${SW_SLOW_DB_THRESHOLD:default:200,redis:50} # The slow database access thresholds. Unit ms. slowDBAccessThreshold: ${SW_SLOW_DB_THRESHOLD:default:200,mongodb:100} # The slow database access thresholds. Unit ms.
receiver-jvm: receiver-jvm:
default: default:
service-mesh: service-mesh: