aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-05-29 16:45:46 +0200
committerJon Bratseth <bratseth@gmail.com>2020-05-29 16:45:46 +0200
commit0cc3b79099a495522b0cb7d5b3ecb021edd353ed (patch)
tree0e41096185b23beca40fb8a1f0d9b1fc0cb00698 /config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
parente28cde3ea0a560c40af32133d25df08299fea8e6 (diff)
Account for container memory in combined cluster
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/content/Content.java')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/content/Content.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
index b3f2b81014b..404a0ceb4ea 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
@@ -39,7 +39,6 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
-import java.util.logging.Logger;
/**
* The config model from a content tag in services.
@@ -49,8 +48,6 @@ import java.util.logging.Logger;
*/
public class Content extends ConfigModel {
- private static final Logger log = Logger.getLogger(Content.class.getName());
-
private ContentCluster cluster;
private Optional<ApplicationContainerCluster> ownedIndexingCluster = Optional.empty();
@@ -207,6 +204,11 @@ public class Content extends ConfigModel {
content.cluster = new ContentCluster.Builder(admin).build(content.containers, modelContext, xml);
buildIndexingClusters(content, modelContext,
(ApplicationConfigProducerRoot)modelContext.getParentProducer());
+ markCombinedClusters();
+ }
+
+ private void markCombinedClusters() {
+
}
/** Select/creates and initializes the indexing cluster coupled to this */