Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Set generation in empty sentinel config response" #8751

Merged
merged 1 commit into from
Mar 12, 2019
Merged

Revert "Set generation in empty sentinel config response" #8751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ private void returnEmpty(JRTServerConfigRequest request) {
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, request.getRequestGeneration() + 1, false, configMd5);
ConfigResponse config = SlimeConfigResponse.fromConfigPayload(emptyPayload, null, 0, false, configMd5);
request.addOkResponse(request.payloadFromResponse(config), config.getGeneration(), false, config.getConfigMd5());
respond(request);
}
Expand Down
2 changes: 0 additions & 2 deletions configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ public void testEmptySentinelConfigWhenAppDeletedOnHostedVespa() throws IOExcept
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());
}
}

Expand Down