diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-12-01 19:32:30 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-12-01 19:32:30 +0100 |
commit | 020f0a4cd1748624793b885a3e73548a8d49768e (patch) | |
tree | 85783f9816fe10adf971d4f6694be0ae0cbaeed3 /config-proxy/src/main | |
parent | b9f054f862e6fc7bdbf41b9404605e2a8ad6b249 (diff) |
Revert "Merge pull request #15577 from vespa-engine/revert-15575-bratseth/apply-on-restart-take-9"
This reverts commit b9f054f862e6fc7bdbf41b9404605e2a8ad6b249, reversing
changes made to 535b586bae36880259a792e2292f02b8495950fe.
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()); |