Merge branch 'master' into hmusum/throw-exception-when-specifyin-resource-limits

4 files changed, 33 insertions, 19 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index bdf2b53bc92..58d2693aace 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -103,7 +103,7 @@
       "public abstract java.io.Reader getHosts()",
       "public java.util.List getUserIncludeDirs()",
       "public void validateIncludeDir(java.lang.String)",
-      "public abstract java.util.Collection searchDefinitionContents()",
+      "public java.util.Collection searchDefinitionContents()",
       "public abstract java.util.Map getAllExistingConfigDefs()",
       "public abstract java.util.List getFiles(com.yahoo.path.Path, java.lang.String, boolean)",
       "public java.util.List getFiles(com.yahoo.path.Path, java.lang.String)",
@@ -127,7 +127,8 @@
       "public void writeMetaData()",
       "public java.util.Optional getAllocatedHosts()",
       "public java.util.Map getFileRegistries()",
-      "public abstract java.util.Collection getSearchDefinitions()",
+      "public java.util.Collection getSearchDefinitions()",
+      "public abstract java.util.Collection getSchemas()",
       "public com.yahoo.config.application.api.ApplicationPackage preprocess(com.yahoo.config.provision.Zone, com.yahoo.config.application.api.DeployLogger)"
     ],
     "fields": [
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
index d97ff5ca774..2aefc985f4b 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.application.api;
 
 import com.yahoo.component.Version;
@@ -79,7 +79,7 @@ public interface ApplicationPackage {
      * @return the name of the application (i.e the directory where the application package was deployed from)
      * @deprecated do not use
      */
-    @Deprecated // TODO: Remove on Vespa 8
+    @Deprecated // TODO: Remove in Vespa 8
     String getApplicationName();
 
     ApplicationId getApplicationId();
@@ -87,14 +87,14 @@ public interface ApplicationPackage {
     /**
      * Contents of services.xml. Caller must close reader after use.
      *
-     * @return a Reader, or null if no services.xml/vespa-services.xml present
+     * @return a Reader, or null if no services.xml present
      */
     Reader getServices();
 
     /**
      * Contents of hosts.xml. Caller must close reader after use.
      *
-     * @return a Reader, or null if no hosts.xml/vespa-hosts.xml present
+     * @return a Reader, or null if no hosts.xml present
      */
     Reader getHosts();
 
@@ -113,9 +113,12 @@ public interface ApplicationPackage {
 
     /**
      * Readers for all the search definition files for this.
+     * @deprecated use {@link #getSchemas()} instead
      * @return a list of readers for search definitions
      */
-    Collection<NamedReader> searchDefinitionContents();
+    @Deprecated
+    // TODO: Remove in Vespa 8
+    default Collection<NamedReader> searchDefinitionContents() { return getSchemas(); }
 
     /**
      * Returns all the config definitions available in this package as unparsed data.
@@ -143,10 +146,11 @@ public interface ApplicationPackage {
 
     /** Returns the major version this application is valid for, or empty if it is valid for all versions */
     default Optional<Integer> getMajorVersion() {
-        if ( ! getDeployment().isPresent()) return Optional.empty();
+        if (getDeployment().isEmpty()) return Optional.empty();
 
         Element deployElement = XML.getDocument(getDeployment().get()).getDocumentElement();
         if (deployElement == null) return Optional.empty();
+
         String majorVersionString = deployElement.getAttribute("major-version");
         if (majorVersionString == null || majorVersionString.isEmpty())
             return Optional.empty();
@@ -178,7 +182,6 @@ public interface ApplicationPackage {
     /** Returns handle for the file containing client certificate authorities */
     default ApplicationFile getClientSecurityFile() { return getFile(SECURITY_DIR.append("clients.pem")); }
 
-    //For generating error messages
     String getHostSource();
     String getServicesSource();
 
@@ -235,7 +238,18 @@ public interface ApplicationPackage {
         return Collections.emptyMap();
     }
 
-    Collection<NamedReader> getSearchDefinitions();
+    /**
+     * @deprecated use {@link #getSchemas()} instead
+     */
+    @Deprecated
+    // TODO: Remove in Vespa 8
+    default Collection<NamedReader> getSearchDefinitions() { return getSchemas(); }
+
+    /**
+     * Readers for all the schema files.
+     * @return a collection of readers for schemas
+     */
+    Collection<NamedReader> getSchemas();
 
     /**
      * Preprocess an application for a given zone and return a new application package pointing to the preprocessed
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java
index 8845431c71b..ea27b7f70d8 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.application.api;
 
 import com.google.common.collect.ImmutableList;
@@ -67,7 +67,7 @@ public class ValidationOverrides {
 
     public boolean allows(String validationIdString, Instant now) {
         Optional<ValidationId> validationId = ValidationId.from(validationIdString);
-        if ( ! validationId.isPresent()) return false; // unknown id -> not allowed
+        if (validationId.isEmpty()) return false; // unknown id -> not allowed
         return allows(validationId.get(), now);
     }
 
@@ -125,8 +125,8 @@ public class ValidationOverrides {
                         .atStartOfDay().atZone(ZoneOffset.UTC).toInstant()
                         .plus(Duration.ofDays(1)); // Make the override valid *on* the "until" date
                 Optional<ValidationId> validationId = ValidationId.from(XML.getValue(allow));
-                if (validationId.isPresent()) // skip unknown ids as they may be valid for other model versions
-                    overrides.add(new ValidationOverrides.Allow(validationId.get(), until));
+                // skip unknown ids as they may be valid for other model versions
+                validationId.ifPresent(id -> overrides.add(new Allow(id, until)));
             }
             return new ValidationOverrides(overrides, xmlForm);
         }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index abca424a838..5158f3ec488 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -74,20 +74,18 @@ public interface ModelContext {
         @ModelFeatureFlag(owners = {"baldersheim"}, comment = "Select sequencer type use while feeding") default String feedSequencerType() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"baldersheim"}) default String responseSequencerType() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"baldersheim"}) default int defaultNumResponseThreads() { return 2; }
-        @ModelFeatureFlag(owners = {"baldersheim"}) default int maxPendingMoveOps() { return 100; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default boolean skipCommunicationManagerThread() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"baldersheim"}) default boolean skipMbusRequestThread() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"baldersheim"}) default boolean skipMbusReplyThread() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"tokle"}) default boolean useAccessControlTlsHandshakeClientAuth() { return true; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default boolean useAsyncMessageHandlingOnSchedule() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"baldersheim"}) default double feedConcurrency() { throw new UnsupportedOperationException("TODO specify default value"); }
-        @ModelFeatureFlag(owners = {"baldersheim"}) default boolean useBucketExecutorForLidSpaceCompact() { return true; }
-        @ModelFeatureFlag(owners = {"baldersheim"}) default boolean useBucketExecutorForBucketMove() { return true; }
-        @ModelFeatureFlag(owners = {"baldersheim"}) default boolean useBucketExecutorForPruneRemoved() { throw new UnsupportedOperationException("TODO specify default value"); }
+        @ModelFeatureFlag(owners = {"baldersheim"}) default boolean useBucketExecutorForPruneRemoved() { return true; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default boolean useExternalRankExpressions() { return false; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default boolean distributeExternalRankExpressions() { return false; }
+        @ModelFeatureFlag(owners = {"baldersheim"}) default int maxConcurrentMergesPerNode() { throw new UnsupportedOperationException("TODO specify default value"); }
+        @ModelFeatureFlag(owners = {"baldersheim"}) default int maxMergeQueueSize() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"geirst"}) default boolean enableFeedBlockInDistributor() { return true; }
-        @ModelFeatureFlag(owners = {"baldersheim", "geirst", "toregge"}) default double maxDeadBytesRatio() { return 0.05; }
         @ModelFeatureFlag(owners = {"hmusum"}, removeAfter = "7.406") default int clusterControllerMaxHeapSizeInMb() { return 128; }
         @ModelFeatureFlag(owners = {"hmusum"}) default int metricsProxyMaxHeapSizeInMb(ClusterSpec.Type type) { return 256; }
         @ModelFeatureFlag(owners = {"bjorncs", "tokle"}) default List<String> allowedAthenzProxyIdentities() { return List.of(); }
@@ -97,6 +95,7 @@ public interface ModelContext {
         @ModelFeatureFlag(owners = {"bjorncs", "jonmv"}, removeAfter = "7.409") default boolean enableJdiscHttp2() { return true; }
         @ModelFeatureFlag(owners = {"tokle", "bjorncs"}) default boolean enableCustomAclMapping() { return false; }
         @ModelFeatureFlag(owners = {"geirst", "vekterli"}) default int numDistributorStripes() { return 0; }
+        @ModelFeatureFlag(owners = {"arnej"}) default boolean requireConnectivityCheck() { return false; }
     }
 
     /** Warning: As elsewhere in this package, do not make backwards incompatible changes that will break old config models! */