Also take number of visitor threads into account.

2 files changed, 10 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorVisitorProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorVisitorProducer.java
index ec93881aae7..748fd7ab04e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorVisitorProducer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorVisitorProducer.java
@@ -1,13 +1,14 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content.storagecluster;
 
+import com.yahoo.vespa.config.content.StorFilestorConfig;
 import com.yahoo.vespa.config.content.core.StorVisitorConfig;
 import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
 
 /**
  * Serves stor-visitor config for storage clusters.
  */
-public class StorVisitorProducer implements StorVisitorConfig.Producer {
+public class StorVisitorProducer implements StorVisitorConfig.Producer, StorFilestorConfig.Producer {
     public static class Builder {
         public StorVisitorProducer build(ModelElement element) {
             ModelElement tuning = element.child("tuning");
@@ -42,6 +43,13 @@ public class StorVisitorProducer implements StorVisitorConfig.Producer {
     }
 
     @Override
+    public void getConfig(StorFilestorConfig.Builder builder) {
+        if (threadCount != null) {
+            builder.num_visitor_threads(threadCount);
+        }
+    }
+
+    @Override
     public void getConfig(StorVisitorConfig.Builder builder) {
         if (threadCount != null) {
             builder.visitorthreads(threadCount);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
index 88b6833221d..035c69a5bd4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
@@ -121,6 +121,7 @@ public class StorageCluster extends AbstractConfigProducer<StorageNode>
     @Override
     public void getConfig(StorFilestorConfig.Builder builder) {
         fileStorProducer.getConfig(builder);
+        storVisitorProducer.getConfig(builder);
     }
 
 }