summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-12-04 14:51:58 +0100
committerJon Bratseth <bratseth@gmail.com>2020-12-04 14:51:58 +0100
commitc3461d455816ebdc3f1f96fd0cf674a531f031f2 (patch)
treecd4630a0c86563f90d93b83abdf5f1bdbb638cbd /config-model
parent8d033083f6f592f4d21973e5419e3494e1e4f383 (diff)
Don't propagate if internal redeploy
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java2
1 files changed, 2 insertions, 0 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 e7ce335d077..9f9c5def406 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
@@ -203,6 +203,8 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
}
private void propagateRestartOnDeploy() {
+ if (applicationPackage.getMetaData().isInternalRedeploy()) return;
+
// Propagate application config setting of restartOnDeploy to cluster deferChangesUntilRestart
for (ApplicationContainerCluster containerCluster : getContainerClusters().values()) {
QrConfig config = getConfig(QrConfig.class, containerCluster.getConfigId());