diff options
Diffstat (limited to 'configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java index 64ccd910120..ad785a33d5b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java @@ -123,7 +123,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> { wantedNodeVespaVersion); MetricUpdater applicationMetricUpdater = metrics.getOrCreateMetricUpdater(Metrics.createDimensions(applicationId)); ServerCache serverCache = new ServerCache(configDefinitionRepo, zkClient.getUserConfigDefinitions()); - return new Application(withDeferredConfigForRestartingClusters(modelFactory.createModel(modelContext)), + return new Application(modelFactory.createModel(modelContext), serverCache, applicationGeneration, modelFactory.version(), @@ -170,15 +170,4 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> { zkClient.readDataplaneTokens()); } - private Model withDeferredConfigForRestartingClusters(Model model) { - if ( ! (model instanceof VespaModel vespaModel)) return model; - for (ClusterSpec.Id cluster : zkClient.readActivationTriggers().restartingClusters()) { - ApplicationContainerCluster containerCluster = vespaModel.getContainerClusters().get(cluster.value()); - if (containerCluster != null) containerCluster.setDeferChangesUntilRestart(true); - ContentCluster contentCluster = vespaModel.getContentClusters().get(cluster.value()); - if (contentCluster != null) contentCluster.setDeferChangesUntilRestart(true); - } - return model; - } - } |