aboutsummaryrefslogtreecommitdiffstats
path: root/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-11-30 21:24:44 +0100
committerJon Bratseth <bratseth@gmail.com>2020-11-30 21:24:44 +0100
commit3d56e0f71adf16f8842f157c5f47c2c952377526 (patch)
treeafcec984bb33e81b83cd84aa71e5907e53e5c4f0 /config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
parent0f2e5b7dba8f7009d227722b9491cc800d4f371b (diff)
Revert "Merge pull request #15549 from vespa-engine/revert-15543-bratseth/apply-on-restart-take-7"
This reverts commit 0f2e5b7dba8f7009d227722b9491cc800d4f371b, reversing changes made to 1d5e07a044bff2aef764cfee0de10802c376e4b7.
Diffstat (limited to 'config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java')
-rw-r--r--config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
index 44f6d65ee65..e9d5d317995 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
@@ -94,6 +94,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
log.log(FINE, () -> "Polled queue and found config " + jrtReq);
if (jrtReq.hasUpdatedGeneration()) {
setInternalRedeploy(jrtReq.responseIsInternalRedeploy());
+ setApplyOnRestart(jrtReq.responseIsApplyOnRestart());
if (jrtReq.hasUpdatedConfig()) {
setNewConfig(jrtReq);
} else {
@@ -111,7 +112,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
} catch (IllegalArgumentException e) {
badConfigE = e;
}
- setConfig(jrtReq.getNewGeneration(), jrtReq.responseIsInternalRedeploy(), configInstance);
+ setConfig(jrtReq.getNewGeneration(), jrtReq.responseIsInternalRedeploy(), jrtReq.responseIsApplyOnRestart(), configInstance);
if (badConfigE != null) {
throw new IllegalArgumentException("Bad config from jrt", badConfigE);
}