diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-03-11 22:16:48 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-03-11 22:16:48 +0100 |
commit | 81141b12283dfbda53da9ab2f3b213692f1b9042 (patch) | |
tree | ff9357a53558c079f170be8e55e8ce54d9d4a70a /configserver | |
parent | 2e4420c7df1e775d1e0821fdb2fd75ee5b9eafb7 (diff) |
Set generation in empty sentinel config response
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java | 2 | ||||
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java index bbdef71129a..bebd0b341db 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java @@ -167,7 +167,7 @@ class GetConfigProcessor implements Runnable { log.log(LogLevel.INFO, "Returning empty sentinel config for request from " + request.getClientHostName()); ConfigPayload emptyPayload = ConfigPayload.empty(); String configMd5 = ConfigUtils.getMd5(emptyPayload); - ConfigResponse config = SlimeConfigResponse.fromConfigPayload(emptyPayload, null, 0, false, configMd5); + ConfigResponse config = SlimeConfigResponse.fromConfigPayload(emptyPayload, null, request.getRequestGeneration() + 1, false, configMd5); request.addOkResponse(request.payloadFromResponse(config), config.getGeneration(), false, config.getConfigMd5()); respond(request); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java index c8bc9364922..959b284220b 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java @@ -96,6 +96,8 @@ public class RpcServerTest { new ConfigPayloadApplier<>(builder).applyPayload(payload); SentinelConfig config = new SentinelConfig(builder); assertEquals(0, config.service().size()); + // Test generation explicitly since it is not set set the usual way + assertTrue(clientReq.getNewGeneration() > clientReq.getRequestGeneration()); } } |