diff options
Diffstat (limited to 'config-model')
32 files changed, 19 insertions, 146 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankTypeResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankTypeResolver.java index 6424fd8ba06..e86ac6dabfc 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankTypeResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankTypeResolver.java @@ -11,7 +11,7 @@ import java.util.logging.Level; /** * Checks if fields have defined different rank types for the same - * index (typically in an index-to statement), and if they have + * index (typically in a fieldset statement), and if they have * output a warning and use the first ranktype. * * @author hmusum diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java index 00a1078b294..098d917c4e0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java @@ -161,6 +161,11 @@ public class HostSystem extends TreeConfigProducer<Host> { deployLogger.log(level, message); } + @Override + public void logApplicationPackage(Level level, String message) { + deployLogger.logApplicationPackage(level, message); + } + } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java index df3cd4103d9..92c9eccf2d3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java @@ -112,9 +112,8 @@ public class ConstantTensorJsonValidator { consumeTopObject(); return; } else if (isScalar()) { - if (top == JsonToken.VALUE_NUMBER_FLOAT || top == JsonToken.VALUE_NUMBER_INT) { - return; - } + throw new InvalidConstantTensorException( + parser, String.format("Invalid type %s: Only tensors with dimensions can be stored as file constants", tensorType.toString())); } throw new InvalidConstantTensorException( parser, String.format("Unexpected first token '%s' for constant with type %s", @@ -315,14 +314,6 @@ public class ConstantTensorJsonValidator { } } - private void assertFieldNameIs(String wantedFieldName) throws IOException { - String actualFieldName = parser.getCurrentName(); - - if (!actualFieldName.equals(wantedFieldName)) { - throw new InvalidConstantTensorException(parser, String.format("Expected field name '%s', got '%s'", wantedFieldName, actualFieldName)); - } - } - static class InvalidConstantTensorException extends IllegalArgumentException { InvalidConstantTensorException(JsonParser parser, String message) { @@ -338,19 +329,6 @@ public class ConstantTensorJsonValidator { } } - @FunctionalInterface - private interface SubroutineThrowingIOException { - void invoke() throws IOException; - } - - private void wrapIOException(SubroutineThrowingIOException lambda) { - try { - lambda.invoke(); - } catch (IOException e) { - throw new InvalidConstantTensorException(parser, e); - } - } - private void consumeValuesNesting(int level) throws IOException { assertCurrentTokenIs(JsonToken.START_ARRAY); if (level >= denseDims.size()) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java index 5bb73643de5..ea4988f3029 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java @@ -290,28 +290,9 @@ public class NodesSpecification { .loadBalancerSettings(zoneEndpoint) .stateful(stateful) .build(); - logInsufficientDiskResources(clusterId, clusterType, logger); return hostSystem.allocateHosts(cluster, Capacity.from(min, max, groupSize, required, canFail, cloudAccount, info), logger); } - /** Log a message if requested disk may not fit core/heap dumps */ - private void logInsufficientDiskResources(ClusterSpec.Id clusterId, ClusterSpec.Type clusterType, DeployLogger deployLogger) { - NodeResources resources = min.nodeResources(); - if (resources.diskGbIsUnspecified() || resources.memoryGbIsUnspecified()) return; - double minDiskGb = resources.memoryGb() * switch (clusterType) { - case combined, content -> 3; - case container -> 2; - default -> 0; // No constraint on other types - }; - if (resources.diskGb() < minDiskGb) { - // TODO(mpolden): Consider enforcing this on Vespa 9 - deployLogger.logApplicationPackage(Level.WARNING, "Requested disk (" + resources.diskGb() + - "Gb) in " + clusterId + " is not large enough to fit " + - "core/heap dumps. Minimum recommended disk resources " + - "is " + minDiskGb + "Gb"); - } - } - private static Pair<NodeResources, NodeResources> nodeResources(ModelElement nodesElement) { ModelElement resources = nodesElement.child("resources"); if (resources != null) { diff --git a/config-model/src/main/javacc/SchemaParser.jj b/config-model/src/main/javacc/SchemaParser.jj index 9a38fdc673e..b2cb258c0ab 100644 --- a/config-model/src/main/javacc/SchemaParser.jj +++ b/config-model/src/main/javacc/SchemaParser.jj @@ -992,6 +992,11 @@ void attribute(ParsedField field) : { <ATTRIBUTE> [name = identifier()] { + // TODO: Remove support for attribute with different name than field name in Vespa 9 + if ( ! name.equals(field.name())) + deployLogger.logApplicationPackage(Level.WARNING, "Creating an attribute for field '" + field.name() + + "' with a different name '" + name + "' than the field name" + + " is deprecated, and support will be removed in Vespa 9. Define a field with the wanted name outside the document instead."); ParsedAttribute attr = field.attributeFor(name); } ( (<COLON> attributeSetting(attr)) @@ -1506,6 +1511,11 @@ void indexInsideField(ParsedField field) : { <INDEX> [indexName = identifier()] { + // TODO: Remove support for index with different name than field name in Vespa 9 + if ( ! indexName.equals(field.name())) + deployLogger.logApplicationPackage(Level.WARNING, "Creating an index for field '" + field.name() + + "' with a different name '" + indexName + "' than the field name" + + " is deprecated, and support will be removed in Vespa 9. Define a field with the wanted name outside the document instead."); op = new ParsedIndex(indexName); } ( (<COLON> indexBody(op) (<COMMA> indexBody(op))*) | diff --git a/config-model/src/test/cfg/admin/metricconfig/schemas/music.sd b/config-model/src/test/cfg/admin/metricconfig/schemas/music.sd index f90d805ce6a..71d588662a0 100644 --- a/config-model/src/test/cfg/admin/metricconfig/schemas/music.sd +++ b/config-model/src/test/cfg/admin/metricconfig/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/application/app1/schemas/music.sd b/config-model/src/test/cfg/application/app1/schemas/music.sd index 92e87848a8a..4e220f96727 100644 --- a/config-model/src/test/cfg/application/app1/schemas/music.sd +++ b/config-model/src/test/cfg/application/app1/schemas/music.sd @@ -7,13 +7,11 @@ search music { field title type string { indexing: summary | index # How this field should be indexed - # index-to: title, default # Create two indexes rank-type: about # Type of ranking settings to apply } field artist type string { indexing: summary | attribute | index - # index-to: artist, default rank-type:about } diff --git a/config-model/src/test/cfg/application/app1/schemas/product.sd b/config-model/src/test/cfg/application/app1/schemas/product.sd index 132ae15053f..70c9343d63a 100644 --- a/config-model/src/test/cfg/application/app1/schemas/product.sd +++ b/config-model/src/test/cfg/application/app1/schemas/product.sd @@ -3,7 +3,6 @@ document product { field title type string { indexing: index | summary - # index-to: title, default } field price type int { diff --git a/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd b/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd index 92e87848a8a..4e220f96727 100644 --- a/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd +++ b/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd @@ -7,13 +7,11 @@ search music { field title type string { indexing: summary | index # How this field should be indexed - # index-to: title, default # Create two indexes rank-type: about # Type of ranking settings to apply } field artist type string { indexing: summary | attribute | index - # index-to: artist, default rank-type:about } diff --git a/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd b/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd index 92e87848a8a..4e220f96727 100644 --- a/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd +++ b/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd @@ -7,13 +7,11 @@ search music { field title type string { indexing: summary | index # How this field should be indexed - # index-to: title, default # Create two indexes rank-type: about # Type of ranking settings to apply } field artist type string { indexing: summary | attribute | index - # index-to: artist, default rank-type:about } diff --git a/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd b/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd index 19528975587..a4cf5cef1a1 100644 --- a/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd +++ b/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd @@ -5,7 +5,6 @@ search music { field title type string { indexing: summary | index - # index-to: title, default } } diff --git a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/book.sd b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/book.sd index 73b540627d7..ba298f4fcba 100644 --- a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/book.sd +++ b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/book.sd @@ -2,34 +2,28 @@ search book { document book inherits base { field title type string { bolding: on - index-to: default, title indexing: index|summary rank-type: about } field dispauthor type string { bolding: on - index-to: default, dispauthor indexing: index|summary rank-type: about } field author type string { bolding: on - index-to: default, author indexing: index|summary rank-type: about } field keys type string { - index-to: default, keys indexing: index rank-type: about } field isbn type string { - index-to: default, isbn indexing: index|summary rank-type: about } field series type string { - index-to: default, series indexing: index rank-type: about } diff --git a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/music.sd b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/music.sd index 498bc79489f..21da176564b 100644 --- a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/music.sd @@ -2,11 +2,9 @@ search music { document music inherits base { field f1 type string { indexing: summary | index - index-to: f1, all } field f2 type string { indexing: summary | index - index-to: f2, all } } } diff --git a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/video.sd b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/video.sd index b010b6d9769..5462be17374 100644 --- a/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/video.sd +++ b/config-model/src/test/cfg/application/validation/testjars/nomanifest/searchdefinitions/video.sd @@ -2,41 +2,34 @@ search video { document video inherits base { field title type string { bolding: on - index-to: default, title indexing: index|summary rank-type: about } field keys type string { - index-to: default, keys indexing: index rank-type: about } field director type string { bolding: on - index-to: default, director indexing: index|summary rank-type: about } field disp_actor type string { bolding: on - index-to: default, disp_actor indexing: index|summary rank-type: about } field actor type string { bolding: on - index-to: default, actor indexing: index|summary rank-type: about } field fmt type string { - index-to: default, fmt indexing: index|summary rank-type: about } field isbn type string { bolding: on - index-to: default, isbn indexing: index|summary rank-type: about } diff --git a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/book.sd b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/book.sd index 73b540627d7..ba298f4fcba 100644 --- a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/book.sd +++ b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/book.sd @@ -2,34 +2,28 @@ search book { document book inherits base { field title type string { bolding: on - index-to: default, title indexing: index|summary rank-type: about } field dispauthor type string { bolding: on - index-to: default, dispauthor indexing: index|summary rank-type: about } field author type string { bolding: on - index-to: default, author indexing: index|summary rank-type: about } field keys type string { - index-to: default, keys indexing: index rank-type: about } field isbn type string { - index-to: default, isbn indexing: index|summary rank-type: about } field series type string { - index-to: default, series indexing: index rank-type: about } diff --git a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/music.sd b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/music.sd index 498bc79489f..21da176564b 100644 --- a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/music.sd +++ b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/music.sd @@ -2,11 +2,9 @@ search music { document music inherits base { field f1 type string { indexing: summary | index - index-to: f1, all } field f2 type string { indexing: summary | index - index-to: f2, all } } } diff --git a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/video.sd b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/video.sd index b010b6d9769..5462be17374 100644 --- a/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/video.sd +++ b/config-model/src/test/cfg/application/validation/testjars/ok/searchdefinitions/video.sd @@ -2,41 +2,34 @@ search video { document video inherits base { field title type string { bolding: on - index-to: default, title indexing: index|summary rank-type: about } field keys type string { - index-to: default, keys indexing: index rank-type: about } field director type string { bolding: on - index-to: default, director indexing: index|summary rank-type: about } field disp_actor type string { bolding: on - index-to: default, disp_actor indexing: index|summary rank-type: about } field actor type string { bolding: on - index-to: default, actor indexing: index|summary rank-type: about } field fmt type string { - index-to: default, fmt indexing: index|summary rank-type: about } field isbn type string { bolding: on - index-to: default, isbn indexing: index|summary rank-type: about } diff --git a/config-model/src/test/cfg/routing/content_two_clusters/schemas/mobile.sd b/config-model/src/test/cfg/routing/content_two_clusters/schemas/mobile.sd index 60ea98235b0..3cc3dcf5526 100644 --- a/config-model/src/test/cfg/routing/content_two_clusters/schemas/mobile.sd +++ b/config-model/src/test/cfg/routing/content_two_clusters/schemas/mobile.sd @@ -3,11 +3,9 @@ search mobile { document mobile { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/routing/content_two_clusters/schemas/music.sd b/config-model/src/test/cfg/routing/content_two_clusters/schemas/music.sd index 290f8983b4d..982607955a7 100644 --- a/config-model/src/test/cfg/routing/content_two_clusters/schemas/music.sd +++ b/config-model/src/test/cfg/routing/content_two_clusters/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/routing/contentsimpleconfig/schemas/music.sd b/config-model/src/test/cfg/routing/contentsimpleconfig/schemas/music.sd index 290f8983b4d..982607955a7 100644 --- a/config-model/src/test/cfg/routing/contentsimpleconfig/schemas/music.sd +++ b/config-model/src/test/cfg/routing/contentsimpleconfig/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/routing/replacehop/schemas/music.sd b/config-model/src/test/cfg/routing/replacehop/schemas/music.sd index 274c6ca63d6..c4dcecbd6ac 100755 --- a/config-model/src/test/cfg/routing/replacehop/schemas/music.sd +++ b/config-model/src/test/cfg/routing/replacehop/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/routing/replaceroute/schemas/music.sd b/config-model/src/test/cfg/routing/replaceroute/schemas/music.sd index 274c6ca63d6..c4dcecbd6ac 100755 --- a/config-model/src/test/cfg/routing/replaceroute/schemas/music.sd +++ b/config-model/src/test/cfg/routing/replaceroute/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/search/data/travel/schemas/TTPOI.sd b/config-model/src/test/cfg/search/data/travel/schemas/TTPOI.sd index f3fe2cdf445..7895d98b2e0 100644 --- a/config-model/src/test/cfg/search/data/travel/schemas/TTPOI.sd +++ b/config-model/src/test/cfg/search/data/travel/schemas/TTPOI.sd @@ -4,13 +4,11 @@ document TTPOI { # categories associated with the POI field Categories type array<string> { indexing: summary | index - # index-to: Categories } # sub catagories associated with the POI field SubCategories type array<string> { indexing: summary | index - # index-to: SubCategories } } diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/music.sd b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/music.sd index 290f8983b4d..982607955a7 100644 --- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/music.sd +++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/schemas/music.sd b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/schemas/music.sd index 290f8983b4d..982607955a7 100644 --- a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/schemas/music.sd +++ b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/cfg/storage/clustercontroller_advanced/schemas/music.sd b/config-model/src/test/cfg/storage/clustercontroller_advanced/schemas/music.sd index 290f8983b4d..982607955a7 100644 --- a/config-model/src/test/cfg/storage/clustercontroller_advanced/schemas/music.sd +++ b/config-model/src/test/cfg/storage/clustercontroller_advanced/schemas/music.sd @@ -3,11 +3,9 @@ search music { document music { field f1 type string { indexing: summary | index - # index-to: f1, all } field f2 type string { indexing: summary | index - # index-to: f2, all } } } diff --git a/config-model/src/test/derived/music3/music3.sd b/config-model/src/test/derived/music3/music3.sd index 7123c45bac2..47867683c62 100644 --- a/config-model/src/test/derived/music3/music3.sd +++ b/config-model/src/test/derived/music3/music3.sd @@ -5,13 +5,11 @@ schema music3 { field title type string { indexing: summary | index - # index-to: title, default rank-type: about } field artist type string { indexing: summary | attribute | index - # index-to: artist, default rank-type:about } diff --git a/config-model/src/test/derived/newrank/newrank.sd b/config-model/src/test/derived/newrank/newrank.sd index 345d01bffb5..a01f292eb27 100644 --- a/config-model/src/test/derived/newrank/newrank.sd +++ b/config-model/src/test/derived/newrank/newrank.sd @@ -99,7 +99,6 @@ schema newrank{ field artist type string { indexing: summary | index - # index-to: artist, default } field artistspid type string { diff --git a/config-model/src/test/examples/attributesexactmatch.sd b/config-model/src/test/examples/attributesexactmatch.sd index 2db687cb20d..5529906adce 100644 --- a/config-model/src/test/examples/attributesexactmatch.sd +++ b/config-model/src/test/examples/attributesexactmatch.sd @@ -29,7 +29,6 @@ search music { } field genre type string { - # index-to: foo } field trumpetist type string { diff --git a/config-model/src/test/examples/casing.sd b/config-model/src/test/examples/casing.sd index b0ce0a07748..7564934949b 100644 --- a/config-model/src/test/examples/casing.sd +++ b/config-model/src/test/examples/casing.sd @@ -31,7 +31,6 @@ search music { field Genre type string { indexing: index - # index-to: Foo alias Foo: sjanger } diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java index b1f47c54d54..c128b9af6e0 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java @@ -2577,44 +2577,6 @@ public class ModelProvisioningTest { assertEquals((long) ((128 - memoryOverheadGb) * GB * 0.08), cfg.flush().memory().each().maxmemory()); // from default node flavor tuning } - @Test - public void warn_on_insufficient_disk_resources() { - String services = """ - <?xml version='1.0' encoding='utf-8' ?> - <services> - <container version='1.0' id='c1'> - <nodes count='1'> - <resources vcpu='1' memory='24Gb' disk='40Gb'/> - </nodes> - </container> - <container version='1.0' id='c2'> - <nodes count='1'> - <resources vcpu='1' memory='24Gb' disk='50Gb'/> - </nodes> - </container> - <content version='1.0' id='c3'> - <redundancy>1</redundancy> - <documents> - <document type='type1' mode='index'/> - </documents> - <nodes count='1'> - <resources vcpu='1' memory='24Gb' disk='50Gb'/> - </nodes> - </content> - </services> - """; - VespaModelTester tester = new VespaModelTester(); - tester.addHosts(new NodeResources(1, 24, 50, 1, DiskSpeed.fast), 10); - TestLogger testLogger = new TestLogger(); - VespaModel model = tester.createModel(services, true, new DeployState.Builder().deployLogger(testLogger)); - assertEquals(1, model.getContainerClusters().get("c1").getContainers().size()); - assertEquals(1, model.getContainerClusters().get("c2").getContainers().size()); - assertEquals(1, model.getContentClusters().get("c3").getSearch().getSearchNodes().size()); - assertEquals(List.of(new TestLogger.LogMessage(Level.WARNING, "Requested disk (40.0Gb) in cluster 'c1' is not large enough to fit core/heap dumps. Minimum recommended disk resources is 48.0Gb"), - new TestLogger.LogMessage(Level.WARNING, "Requested disk (50.0Gb) in cluster 'c3' is not large enough to fit core/heap dumps. Minimum recommended disk resources is 72.0Gb")), - testLogger.msgs()); - } - private static ProtonConfig getProtonConfig(VespaModel model, String configId) { ProtonConfig.Builder builder = new ProtonConfig.Builder(); model.getConfig(builder, configId); diff --git a/config-model/src/test/java/com/yahoo/schema/IndexSettingsTestCase.java b/config-model/src/test/java/com/yahoo/schema/IndexSettingsTestCase.java index b1d502dec36..7990d76d023 100644 --- a/config-model/src/test/java/com/yahoo/schema/IndexSettingsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/IndexSettingsTestCase.java @@ -37,7 +37,7 @@ public class IndexSettingsTestCase extends AbstractSchemaTestCase { } @Test - void requireThatInterlavedFeaturesAreSetOnExtraField() throws ParseException { + void requireThatInterleavedFeaturesAreSetOnExtraField() throws ParseException { ApplicationBuilder builder = ApplicationBuilder.createFromString(joinLines( "search test {", " document test {", |