diff options
author | Harald Musum <musum@yahooinc.com> | 2021-09-15 22:23:03 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2021-09-15 22:23:03 +0200 |
commit | d720d98e1c6b9ce70d9a2b516c01da0d59857477 (patch) | |
tree | f5e1c5541c25dad068c5cde978b96bcd646c590e /config/src/main/java | |
parent | b998d5f0db4d88db85e055e8985d70af3d3453a0 (diff) |
More cleanup of md5 usage
Diffstat (limited to 'config/src/main/java')
4 files changed, 4 insertions, 21 deletions
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java index bb1a154d5d0..e83fc7aefc5 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java @@ -18,6 +18,7 @@ import java.time.Instant; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; +import static com.yahoo.vespa.config.PayloadChecksum.Type.MD5; import static java.util.logging.Level.FINE; import static java.util.logging.Level.INFO; @@ -129,7 +130,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc Payload payload = jrtRequest.getNewPayload(); ConfigPayload configPayload = ConfigPayload.fromUtf8Array(payload.withCompression(CompressionType.UNCOMPRESSED).getData()); T configInstance = configPayload.toInstance(configClass, jrtRequest.getConfigKey().getConfigId()); - configInstance.setConfigMd5(jrtRequest.getNewConfigMd5()); // Note: Sets configmd5 in ConfigInstance + configInstance.setConfigMd5(jrtRequest.getNewChecksums().getForType(MD5).asString()); // Note: Sets configmd5 in ConfigInstance return configInstance; } diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequest.java b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequest.java index 9d3b87574f3..f47192c916c 100644 --- a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequest.java +++ b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequest.java @@ -59,13 +59,6 @@ public interface JRTClientConfigRequest extends JRTConfigRequest { boolean responseIsApplyOnRestart(); /** - * Gets the config md5 of the config returned by the server. Returns an empty string if no response has been returned. - * - * @return a config md5. - */ - String getNewConfigMd5(); - - /** * Gets the config checksums of the config returned by the server. Returns an empty string if no response has been returned. * * @return a config checksum. diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java index bd69c77921d..68a9601cb02 100644 --- a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java +++ b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java @@ -178,7 +178,7 @@ public class JRTClientConfigRequestV3 implements JRTClientConfigRequest { StringBuilder sb = new StringBuilder(); sb.append("request='").append(getConfigKey()) .append(",").append(getClientHostName()) - .append(",").append(getRequestConfigMd5()) + .append(",").append(getRequestConfigChecksums()) .append(",").append(getRequestGeneration()) .append(",").append(getTimeout()) .append(",").append(getVespaVersion().map(VespaVersion::toString).orElse("")) @@ -233,12 +233,6 @@ public class JRTClientConfigRequestV3 implements JRTClientConfigRequest { return newChecksum; } - protected String newConfMd5() { - String newMd5 = getNewConfigMd5(); - if ("".equals(newMd5)) return getRequestConfigMd5(); - return newMd5; - } - protected long newGen() { long newGen = getNewGeneration(); if (newGen == 0) return getRequestGeneration(); @@ -312,11 +306,6 @@ public class JRTClientConfigRequestV3 implements JRTClientConfigRequest { } @Override - public String getNewConfigMd5() { - return responseData.getResponseConfigMd5().asString(); - } - - @Override public PayloadChecksums getNewChecksums() { return responseData.getResponseConfigChecksums(); } diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTServerConfigRequestV3.java b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTServerConfigRequestV3.java index d342e42ec03..446ddf0560b 100644 --- a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTServerConfigRequestV3.java +++ b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTServerConfigRequestV3.java @@ -152,7 +152,7 @@ public class JRTServerConfigRequestV3 implements JRTServerConfigRequest { StringBuilder sb = new StringBuilder(); sb.append("request='").append(getConfigKey()) .append(",").append(getClientHostName()) - .append(",").append(getRequestConfigMd5()) + .append(",").append(getRequestConfigChecksums()) .append(",").append(getRequestGeneration()) .append(",").append(getTimeout()).append("'\n"); return sb.toString(); |