diff options
3 files changed, 34 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java index e8e02d8aba1..3c45b29b1e2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java @@ -334,6 +334,7 @@ public class IndexedSearchCluster extends SearchCluster if (searchCoverage.getMaxWaitAfterCoverageFactor() != null) builder.maxWaitAfterCoverageFactor(searchCoverage.getMaxWaitAfterCoverageFactor()); } + builder.warmuptime(5.0); } @Override diff --git a/configdefinitions/src/vespa/dispatch.def b/configdefinitions/src/vespa/dispatch.def index 77f6dffd714..21001eb3af0 100644 --- a/configdefinitions/src/vespa/dispatch.def +++ b/configdefinitions/src/vespa/dispatch.def @@ -48,6 +48,9 @@ numJrtTransportThreads int default=8 # Number of JRT connections per backend node numJrtConnectionsPerNode int default=8 +# Number of seconds to spend warming up code to prevent JIT cold start issues. +warmuptime double default=0.1 + # The unique key of a search node node[].key int diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java index 423de07f8c4..6a25c9a5f4f 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java @@ -5,6 +5,7 @@ import com.google.inject.Inject; import com.yahoo.cloud.config.ClusterInfoConfig; import com.yahoo.component.AbstractComponent; import com.yahoo.component.ComponentId; +import com.yahoo.compress.Compressor; import com.yahoo.container.handler.VipStatus; import com.yahoo.jdisc.Metric; import com.yahoo.prelude.fastsearch.VespaBackEndSearcher; @@ -30,7 +31,13 @@ import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.OptionalInt; +import java.util.Random; import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; /** * A dispatcher communicates with search nodes to perform queries and fill hits. @@ -118,10 +125,18 @@ public class Dispatcher extends AbstractComponent { this.metricContext = metric.createContext(null); this.maxHitsPerNode = dispatchConfig.maxHitsPerNode(); searchCluster.addMonitoring(clusterMonitor); + Thread warmup = new Thread(new Runnable() { + @Override + public void run() { + warmupLZ4(dispatchConfig.warmuptime()); + } + }); + warmup.start(); try { while ( ! searchCluster.hasInformationAboutAllNodes()) { Thread.sleep(1); } + warmup.join(); } catch (InterruptedException e) {} /* @@ -133,6 +148,21 @@ public class Dispatcher extends AbstractComponent { searchCluster.pingIterationCompleted(); } + private static long warmupLZ4(double seconds) { + byte [] input = new byte[0x4000]; + Compressor lz4 = new Compressor(); + new Random().nextBytes(input); + long timeDone = System.nanoTime() + (long)(seconds*1000000000); + long compressedBytes = 0; + byte [] decompressed = new byte [input.length]; + while (System.nanoTime() < timeDone) { + byte [] compressed = lz4.compressUnconditionally(input); + lz4.decompressUnconditionally(compressed, decompressed); + compressedBytes += compressed.length; + } + return compressedBytes; + } + /** Returns the search cluster this dispatches to */ public SearchCluster searchCluster() { return searchCluster; |