diff options
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container/Container.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/Container.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java index 6e470b24f9f..5e95403313c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java @@ -306,9 +306,7 @@ public abstract class Container extends AbstractService implements .port(getRpcPort()) .slobrokId(serviceSlobrokId())) .filedistributor(filedistributorConfig()) - .discriminator((clusterName != null ? clusterName + "." : "" ) + name) - .restartOnDeploy(owner != null && owner.getDeferChangesUntilRestart()); - + .discriminator((clusterName != null ? clusterName + "." : "" ) + name); } /** Returns the jvm args set explicitly for this node */ @@ -330,6 +328,7 @@ public abstract class Container extends AbstractService implements @Override public void getConfig(ComponentsConfig.Builder builder) { + builder.setApplyOnRestart(owner.getDeferChangesUntilRestart()); // Sufficient to set on one config builder.components.addAll(ComponentsConfigGenerator.generate(allEnabledComponents())); } |