diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-11-30 21:24:44 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-11-30 21:24:44 +0100 |
commit | 3d56e0f71adf16f8842f157c5f47c2c952377526 (patch) | |
tree | afcec984bb33e81b83cd84aa71e5907e53e5c4f0 /config-proxy/src/main | |
parent | 0f2e5b7dba8f7009d227722b9491cc800d4f371b (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-proxy/src/main')
-rw-r--r-- | config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java | 6 |
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()); |