Allow applications to override threadpool configuration in services.xml

1 files changed, 12 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
index 34de21de404..99ae6184f5c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.model.container.xml;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.text.XML;
 import com.yahoo.vespa.model.clients.ContainerDocumentApi;
+import com.yahoo.vespa.model.container.ContainerThreadpool;
 import org.w3c.dom.Element;
 
 import java.util.ArrayList;
@@ -20,7 +21,17 @@ public class DocumentApiOptionsBuilder {
 
 
     public static ContainerDocumentApi.Options build(DeployState deployState, Element spec) {
-        return new ContainerDocumentApi.Options(getBindings(spec), deployState.getProperties().feedCoreThreadPoolSizeFactor());
+        return new ContainerDocumentApi.Options(
+                getBindings(spec),
+                threadpoolOptions(spec, "rest-api"),
+                threadpoolOptions(spec, "http-client-api"),
+                deployState.getProperties().feedCoreThreadPoolSizeFactor());
+    }
+
+    private static ContainerThreadpool.UserOptions threadpoolOptions(Element spec, String elementName) {
+        Element element = XML.getChild(spec, elementName);
+        if (element == null) return null;
+        return ContainerThreadpool.UserOptions.fromXml(element).orElse(null);
     }
 
     private static List<String> getBindings(Element spec) {