diff options
author | jonmv <venstad@gmail.com> | 2022-06-14 15:18:59 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-06-14 15:18:59 +0200 |
commit | ed7e067b0866108d2d4f23c0a98e9769f25576f3 (patch) | |
tree | 32f4e71324d1defa1d9802fe62d6baf9359218ef /config | |
parent | 48d5dde7e5c7b3b17ef2a31e5075de7031f8cf05 (diff) |
Refuse config only when there is a possibility of incompatible Java bundles
Diffstat (limited to 'config')
-rw-r--r-- | config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java | 6 | ||||
-rw-r--r-- | config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java b/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java index be935043dc0..7de2de017ee 100644 --- a/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java +++ b/config/src/main/java/com/yahoo/vespa/config/PayloadChecksums.java @@ -70,6 +70,12 @@ public class PayloadChecksums { public boolean isEmpty() { return this.equals(empty()); } + public boolean matches(PayloadChecksums other) { + if (getForType(XXHASH64) != null) return getForType(XXHASH64).equals(other.getForType(XXHASH64)); + if (getForType(MD5) != null) return getForType(MD5).equals(other.getForType(MD5)); + return true; + } + @Override public String toString() { return checksums.values().stream() diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java b/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java index 771068aa67a..c7326ea37f1 100644 --- a/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java +++ b/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java @@ -26,18 +26,6 @@ public interface ConfigResponse { void serialize(OutputStream os, CompressionType uncompressed) throws IOException; - default boolean hasEqualConfig(JRTServerConfigRequest request) { - PayloadChecksums payloadChecksums = getPayloadChecksums(); - PayloadChecksum xxhash64 = payloadChecksums.getForType(PayloadChecksum.Type.XXHASH64); - PayloadChecksum md5 = payloadChecksums.getForType(PayloadChecksum.Type.MD5); - if (xxhash64 != null) - return xxhash64.equals(request.getRequestConfigChecksums().getForType(PayloadChecksum.Type.XXHASH64)); - if (md5 != null) - return md5.equals(request.getRequestConfigChecksums().getForType(PayloadChecksum.Type.MD5)); - - return true; - } - default boolean hasNewerGeneration(JRTServerConfigRequest request) { return (getGeneration() > request.getRequestGeneration()); } |