diff options
Diffstat (limited to 'config-model/src')
4 files changed, 10 insertions, 27 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index 54630426cb8..b815b72f851 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -36,8 +36,6 @@ public class TestProperties implements ModelContext.Properties { private boolean hostedVespa = false; private Zone zone; private Set<ContainerEndpoint> endpoints = Collections.emptySet(); - private boolean isBootstrap = false; - private boolean isFirstTimeDeployment = false; private boolean useDedicatedNodeForLogserver = false; private boolean useAdaptiveDispatch = false; private double topKProbability = 1.0; @@ -47,7 +45,6 @@ public class TestProperties implements ModelContext.Properties { private double softStartSeconds = 0.0; private double threadPoolSizeFactor = 0.0; private double queueSizeFactor = 0.0; - private int defaultNumResponseThreads = 0; private Optional<EndpointCertificateSecrets> endpointCertificateSecrets = Optional.empty(); private AthenzDomain athenzDomain; private ApplicationRoles applicationRoles; @@ -62,8 +59,8 @@ public class TestProperties implements ModelContext.Properties { @Override public Zone zone() { return zone; } @Override public Set<ContainerEndpoint> endpoints() { return endpoints; } - @Override public boolean isBootstrap() { return isBootstrap; } - @Override public boolean isFirstTimeDeployment() { return isFirstTimeDeployment; } + @Override public boolean isBootstrap() { return false; } + @Override public boolean isFirstTimeDeployment() { return false; } @Override public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; } @Override public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; } @Override public Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return endpointCertificateSecrets; } @@ -84,10 +81,6 @@ public class TestProperties implements ModelContext.Properties { return softStartSeconds; } - @Override public int defaultNumResponseThreads() { - return defaultNumResponseThreads; - } - @Override public double defaultTopKProbability() { return topKProbability; } @Override public boolean useDistributorBtreeDb() { return useDistributorBtreeDb; } @Override public boolean useThreePhaseUpdates() { return useThreePhaseUpdates; } @@ -109,11 +102,6 @@ public class TestProperties implements ModelContext.Properties { return this; } - public TestProperties setDefaultNumResponseThreads(int numResponseThreads) { - defaultNumResponseThreads = numResponseThreads; - return this; - } - public TestProperties setUseThreePhaseUpdates(boolean useThreePhaseUpdates) { this.useThreePhaseUpdates = useThreePhaseUpdates; return this; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java index 76c05d4028a..eaefa8ea35f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java @@ -11,8 +11,8 @@ import com.yahoo.vespa.model.content.cluster.ContentCluster; public class FileStorProducer implements StorFilestorConfig.Producer { public static class Builder { - protected FileStorProducer build(ContentCluster parent, Integer numResponseThreads, ModelElement clusterElem) { - return new FileStorProducer(parent, getThreads(clusterElem), numResponseThreads); + protected FileStorProducer build(ContentCluster parent, ModelElement clusterElem) { + return new FileStorProducer(parent, getThreads(clusterElem)); } private Integer getThreads(ModelElement clusterElem) { @@ -43,12 +43,10 @@ public class FileStorProducer implements StorFilestorConfig.Producer { private final Integer numThreads; private final ContentCluster cluster; - private final Integer numResponseThreads; - public FileStorProducer(ContentCluster parent, Integer numThreads, Integer numResponseThreads) { + public FileStorProducer(ContentCluster parent, Integer numThreads) { this.numThreads = numThreads; this.cluster = parent; - this.numResponseThreads = numResponseThreads; } @Override @@ -56,9 +54,6 @@ public class FileStorProducer implements StorFilestorConfig.Producer { if (numThreads != null) { builder.num_threads(numThreads); } - if (numResponseThreads != null) { - builder.num_response_threads(numResponseThreads); - } builder.enable_multibit_split_optimalization(cluster.getPersistence().enableMultiLevelSplitting()); } 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 c97b4c50484..091e82a9c76 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 @@ -36,7 +36,7 @@ public class StorageCluster extends AbstractConfigProducer<StorageNode> return new StorageCluster(ancestor, ContentCluster.getClusterName(clusterElem), - new FileStorProducer.Builder().build(cluster, deployState.getProperties().defaultNumResponseThreads(), clusterElem), + new FileStorProducer.Builder().build(cluster, clusterElem), new IntegrityCheckerProducer.Builder().build(cluster, clusterElem), new StorServerProducer.Builder().build(clusterElem), new StorVisitorProducer.Builder().build(clusterElem), diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java index fdf911231d5..96fe7fc5775 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java @@ -143,7 +143,7 @@ public class StorageClusterTest { assertEquals(7, config.num_threads()); assertFalse(config.enable_multibit_split_optimalization()); - assertEquals(0, config.num_response_threads()); + assertEquals(1, config.num_response_threads()); } { assertEquals(1, stc.getChildren().size()); @@ -168,13 +168,13 @@ public class StorageClusterTest { " <node distribution-key=\"0\" hostalias=\"mockhost\"/>" + " </group>" + "</cluster>", - new Flavor(new FlavorsConfig.Flavor.Builder().name("test-flavor").minCpuCores(9).build()), - new TestProperties().setDefaultNumResponseThreads(3) + new Flavor(new FlavorsConfig.Flavor.Builder().name("test-flavor").minCpuCores(9).build()) ); StorFilestorConfig.Builder builder = new StorFilestorConfig.Builder(); stc.getConfig(builder); StorFilestorConfig config = new StorFilestorConfig(builder); - assertEquals(3, config.num_response_threads()); + assertEquals(1, config.num_response_threads()); + assertEquals(7, config.num_threads()); } @Test |