diff options
author | Harald Musum <musum@yahoo-inc.com> | 2016-08-23 13:04:32 +0200 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2016-08-23 13:04:32 +0200 |
commit | 19ca3c72184162277be12673e01d338ce9984def (patch) | |
tree | 3c0cf1c88b975d13b0d9d9ddf8862691e78b72ef /config | |
parent | 32e45e8676ab6129033b59bb8cb30549cfe4a090 (diff) |
Remove check for changed payload without changed generation
VESPA-4039
* Remove check, as this has bitten us where the config payload has
changed, but config generation has not changed. This happens when
a config server goes down and the client changes config server, which
might lead to e.g. a map being in a different order than expected. If
this happens many times, we might miss a config change, since the
reconnect delay might be so large that we miss one generation.
Diffstat (limited to 'config')
-rw-r--r-- | config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java index 2cb61cac427..9d42b6b077c 100644 --- a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java +++ b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java @@ -5,7 +5,6 @@ import com.yahoo.jrt.*; import com.yahoo.slime.*; import com.yahoo.text.Utf8; import com.yahoo.vespa.config.ConfigKey; -import com.yahoo.vespa.config.ErrorCode; import com.yahoo.vespa.config.util.ConfigUtils; import java.io.ByteArrayOutputStream; @@ -187,12 +186,6 @@ public abstract class SlimeClientConfigRequest implements JRTClientConfigRequest log.warning("Invalid return types for config response: " + errorMessage()); return false; } - if (hasUpdatedConfig() && ! hasUpdatedGeneration()) { - request.setError(ErrorCode.OUTDATED_CONFIG, "Config payload has changed (old config md5:" + - getRequestConfigMd5() + ", new config md5: " + getNewConfigMd5() +"), but new generation " + - getNewGeneration() + " is not newer than current generation " + getRequestGeneration() + "."); - return false; - } return true; } |