summaryrefslogtreecommitdiffstats
path: root/config-proxy/src/main
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-11-26 17:57:03 +0100
committerJon Bratseth <bratseth@gmail.com>2020-11-26 17:57:03 +0100
commite4e3a4ae969180ed4614e94328b9f758c0adcc81 (patch)
treebebf65b3edc66903c449c74a53207c8a347bda49 /config-proxy/src/main
parent93c54404d24aa61848914859ba4dacf685f5d4fd (diff)
Revert "Merge pull request #15492 from vespa-engine/revert-15450-bratseth/apply-on-restart"
This reverts commit ba62308f10b5d825d2de61ac2ea3de2c2dd067fc, reversing changes made to ffa40d46f1b0911dff10c98e5950117857474416.
Diffstat (limited to 'config-proxy/src/main')
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
index 30f4884c737..81ecd8620b9 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
@@ -350,7 +350,11 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
public void returnOkResponse(JRTServerConfigRequest request, RawConfig config) {
request.getRequestTrace().trace(TRACELEVEL, "Config proxy returnOkResponse()");
- request.addOkResponse(config.getPayload(), config.getGeneration(), config.isInternalRedeploy(), config.getConfigMd5());
+ request.addOkResponse(config.getPayload(),
+ config.getGeneration(),
+ config.isInternalRedeploy(),
+ config.applyOnRestart(),
+ config.getConfigMd5());
log.log(Level.FINE, () -> "Return response: " + request.getShortDescription() + ",configMd5=" + config.getConfigMd5() +
",generation=" + config.getGeneration());
log.log(Level.FINEST, () -> "Config payload in response for " + request.getShortDescription() + ":" + config.getPayload());