diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-12-10 13:58:05 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-12-10 13:58:05 +0100 |
| commit | 5591e4bf8111f04e37f41141b3aa2204b21a594a (patch) | |
| tree | 34fc43c39409b1bf716b413ba04f628d012e471a /config-model | |
| parent | bdf02b5a355e14d83831d09964f78f9b6becefdc (diff) | |
No functional changes
Diffstat (limited to 'config-model')
3 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java index da3163b5533..d1c93bcd611 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java @@ -130,7 +130,6 @@ public class Validation { private static void deferConfigChangesForClustersToBeRestarted(List<ConfigChangeAction> actions, VespaModel model) { Set<ClusterSpec.Id> clustersToBeRestarted = actions.stream() .filter(action -> action.getType() == ConfigChangeAction.Type.RESTART) - .filter(action -> action.clusterId() != null) // TODO: Remove this line after October 2020 .map(action -> action.clusterId()) .collect(Collectors.toSet()); for (var clusterToRestart : clustersToBeRestarted) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java index bc1d138b6d5..97d6c99f6c8 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java @@ -64,7 +64,7 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot private final Map<StorageGroup, NodeSpec> groupToSpecMap = new LinkedHashMap<>(); private Optional<ResourceLimits> resourceLimits = Optional.empty(); private final ProtonConfig.Indexing.Optimize.Enum feedSequencerType; - private double defaultFeedConcurrency; + private final double defaultFeedConcurrency; /** Whether the nodes of this cluster also hosts a container cluster in a hosted system */ private final boolean combined; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java index 61bf42af379..8e91f14238e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java @@ -25,4 +25,5 @@ public class DomResourceLimitsBuilder { } return builder.build(); } + } |