diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-11-30 16:09:32 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-11-30 16:09:32 +0100 |
commit | a140a180467ccc2c2325f0ef0396db7a07022f5d (patch) | |
tree | ac476ec91a2392e032b16144c14cbcae51a45023 /config-proxy/src/main | |
parent | cf34278a1f367301a740d9781cd07d32175bbd49 (diff) |
Revert "Merge pull request #15542 from vespa-engine/revert-15540-bratseth/apply-on-restart-take-6"
This reverts commit cf34278a1f367301a740d9781cd07d32175bbd49, reversing
changes made to 9d64924f89a48e712403fb73808e2280bfe3dfe3.
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()); |