diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2019-02-21 10:49:56 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2019-02-21 10:49:56 +0000 |
commit | 7f56f8b54e1b9053dbee760e8f611425200ddc1e (patch) | |
tree | c8650846cbb338acef5fe48b274a8451fe7811a1 | |
parent | 866f0eddf39703a677eda0a34ed1150e39953a67 (diff) |
move allocated hosts setup
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index 6f53cc3ca6c..d954c69d144 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -172,7 +172,6 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri if (complete) { // create a a completed, frozen model configModelRepo.readConfigModels(deployState, this, builder, root, configModelRegistry); addServiceClusters(deployState, builder); - this.allocatedHosts = AllocatedHosts.withHosts(hostSystem.getHostSpecs()); // must happen after the two lines above setupRouting(deployState); this.fileDistributor = root.getFileDistributionConfigProducer().getFileDistributor(); getAdmin().addPerHostServices(hostSystem.getHosts(), deployState); @@ -181,6 +180,8 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri configModelRepo.prepareConfigModels(deployState); validateWrapExceptions(); hostSystem.dumpPortAllocations(); + // must happen after stuff above + this.allocatedHosts = AllocatedHosts.withHosts(hostSystem.getHostSpecs()); } else { // create a model with no services instantiated and the given file distributor this.allocatedHosts = AllocatedHosts.withHosts(hostSystem.getHostSpecs()); |