aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2019-01-08 08:34:56 +0100
committerHarald Musum <musum@oath.com>2019-01-08 08:34:56 +0100
commitfe207780db6029cc1b8a8a199bc3a60c53b3e763 (patch)
tree119424d240a5843f7bbb4a03d0bb7d202f140522 /config
parent8191ade44977f2874d60fc6811bbb9427a60510d (diff)
Prepare for removing wanted generation in confi requests
wawnted generation is not used (always 0), start with removing validation
Diffstat (limited to 'config')
-rw-r--r--config/src/main/java/com/yahoo/vespa/config/protocol/RequestValidation.java4
-rw-r--r--config/src/main/java/com/yahoo/vespa/config/protocol/SlimeRequestData.java2
2 files changed, 1 insertions, 5 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/RequestValidation.java b/config/src/main/java/com/yahoo/vespa/config/protocol/RequestValidation.java
index d02f5436b80..fed9a96504d 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/RequestValidation.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/RequestValidation.java
@@ -43,10 +43,6 @@ public class RequestValidation {
log.log(LogLevel.INFO, "Illegal generation '" + request.getRequestGeneration() + "'");
return ErrorCode.ILLEGAL_GENERATION;
}
- if (!RequestValidation.verifyGeneration(request.getWantedGeneration())) {
- log.log(LogLevel.INFO, "Illegal wanted generation '" + request.getWantedGeneration() + "'");
- return ErrorCode.ILLEGAL_GENERATION;
- }
if (!RequestValidation.verifyTimeout(request.getTimeout())) {
log.log(LogLevel.INFO, "Illegal timeout '" + request.getTimeout() + "'");
return ErrorCode.ILLEGAL_TIMEOUT;
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeRequestData.java b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeRequestData.java
index 5e88c4cb146..ec6559f4ed7 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeRequestData.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeRequestData.java
@@ -110,7 +110,7 @@ class SlimeRequestData {
defSchema.serialize(request.setArray(REQUEST_DEF_CONTENT));
request.setString(REQUEST_CONFIG_MD5, configMd5);
request.setLong(REQUEST_CURRENT_GENERATION, generation);
- request.setLong(REQUEST_WANTED_GENERATION, 0L);
+ request.setLong(REQUEST_WANTED_GENERATION, 0L); // TODO: Remove when latest version in use is 6.328.19
request.setLong(REQUEST_TIMEOUT, timeout);
request.setString(REQUEST_COMPRESSION_TYPE, compressionType.name());
vespaVersion.ifPresent(version -> request.setString(REQUEST_VESPA_VERSION, version.toString()));