diff options
author | Harald Musum <musum@yahooinc.com> | 2021-09-15 20:46:36 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2021-09-15 20:46:36 +0200 |
commit | b998d5f0db4d88db85e055e8985d70af3d3453a0 (patch) | |
tree | c8bd47dee197b69cbdb550bd6f84c6377edb85be | |
parent | 5069740fcfca69f9b3ff8322b1b900f25c26a27b (diff) |
Remove getConfigMd5() from RawConfig, update usage
6 files changed, 15 insertions, 21 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java index 2d9f4bd7fd0..d277ec66166 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java @@ -315,7 +315,7 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer sb.append(","); sb.append(config.getGeneration()); sb.append(","); - sb.append(config.getConfigMd5()); + sb.append(config.getPayloadChecksums()); if (full) { sb.append(","); sb.append(config.getPayload()); @@ -354,7 +354,7 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer config.getGeneration(), config.applyOnRestart(), config.getPayloadChecksums()); - log.log(Level.FINE, () -> "Return response: " + request.getShortDescription() + ",configMd5=" + config.getConfigMd5() + + log.log(Level.FINE, () -> "Return response: " + request.getShortDescription() + ",config checksums=" + config.getPayloadChecksums() + ",generation=" + config.getGeneration()); log.log(Level.FINEST, () -> "Config payload in response for " + request.getShortDescription() + ":" + config.getPayload()); diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java index 86f2022fa82..5320a04cc84 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.config.proxy; import com.yahoo.io.IOUtils; -import java.util.logging.Level; import com.yahoo.vespa.config.ConfigCacheKey; import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.RawConfig; @@ -16,6 +15,7 @@ import java.io.Writer; import java.nio.file.Files; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; /** @@ -112,9 +112,7 @@ public class MemoryCache { String filename = path + File.separator + createCacheFileName(config); Writer writer = null; try { - if (log.isLoggable(Level.FINE)) { - log.log(Level.FINE, "Writing '" + config.getKey() + "' to '" + filename + "'"); - } + log.log(Level.FINE, () -> "Writing '" + config.getKey() + "' to '" + filename + "'"); final Payload payload = config.getPayload(); long protocolVersion = 3; log.log(Level.FINE, () -> "Writing config '" + config + "' to file '" + filename + "' with protocol version " + protocolVersion); @@ -122,9 +120,9 @@ public class MemoryCache { // First three lines are meta-data about config as comment lines, fourth line is empty writer.write("# defMd5:" + config.getDefMd5() + "\n"); - writer.write("# configMd5:" + config.getConfigMd5() + "\n"); - writer.write("# generation:" + Long.toString(config.getGeneration()) + "\n"); - writer.write("# protocolVersion:" + Long.toString(protocolVersion) + "\n"); + writer.write("# config checksums:" + config.getPayloadChecksums() + "\n"); + writer.write("# generation:" + config.getGeneration() + "\n"); + writer.write("# protocolVersion:" + protocolVersion + "\n"); writer.write("\n"); writer.write(payload.withCompression(CompressionType.UNCOMPRESSED).toString()); writer.write("\n"); diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java index 3b9b101a8c6..71f1571b9c8 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java @@ -10,11 +10,6 @@ import com.yahoo.jrt.Spec; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; import com.yahoo.jrt.Transport; - -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Level; import com.yahoo.vespa.config.ConfigCacheKey; import com.yahoo.vespa.config.RawConfig; import com.yahoo.vespa.config.TimingValues; @@ -22,10 +17,14 @@ import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.DelayQueue; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; +import java.util.logging.Level; import java.util.logging.Logger; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -134,7 +133,7 @@ class RpcConfigSourceClient implements ConfigSourceClient, Runnable { RawConfig ret = null; if (cachedConfig != null) { log.log(Level.FINE, () -> "Found config " + configCacheKey + " in cache, generation=" + cachedConfig.getGeneration() + - ",configmd5=" + cachedConfig.getConfigMd5()); + ",config checksums=" + cachedConfig.getPayloadChecksums()); log.log(Level.FINEST, () -> "input config=" + input + ",cached config=" + cachedConfig); if (ProxyServer.configOrGenerationHasChanged(cachedConfig, request)) { log.log(Level.FINEST, () -> "Cached config is not equal to requested, will return it"); diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java index 628e1c013e6..50a02f7776b 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java @@ -102,7 +102,7 @@ public class ConfigProxyRpcServerTest { assertThat(ret[0], is(config.getNamespace() + "." + config.getName() + "," + config.getConfigId() + "," + config.getGeneration() + "," + - config.getConfigMd5())); + config.getPayloadChecksums())); } /** @@ -128,7 +128,7 @@ public class ConfigProxyRpcServerTest { assertThat(ret[0], is(config.getNamespace() + "." + config.getName() + "," + config.getConfigId() + "," + config.getGeneration() + "," + - config.getConfigMd5() + "," + + config.getPayloadChecksums() + "," + config.getPayload().getData())); } diff --git a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java index 30e169e2597..71abaa9dc48 100755 --- a/config/src/main/java/com/yahoo/vespa/config/RawConfig.java +++ b/config/src/main/java/com/yahoo/vespa/config/RawConfig.java @@ -103,7 +103,6 @@ public class RawConfig extends ConfigInstance { req.getVespaVersion()); } - public ConfigKey<?> getKey() { return key; } public String getName() { return key.getName(); } @@ -112,8 +111,6 @@ public class RawConfig extends ConfigInstance { public String getConfigId() { return key.getConfigId(); } - public String getConfigMd5() { return payloadChecksums.getForType(PayloadChecksum.Type.MD5).asString(); } - public String getDefMd5() { return defMd5; } public long getGeneration() { return generation; } diff --git a/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java b/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java index 96a2d976f51..12c1d2f8069 100644 --- a/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java @@ -99,8 +99,8 @@ public class RawConfigTest { public void payload() { RawConfig config = new RawConfig(key, defMd5, payload, payloadChecksums, generation, false, defContent, Optional.empty()); assertEquals(config.getPayload(), payload); - assertEquals(config.getConfigMd5(), payloadChecksums.getForType(MD5).asString()); assertEquals(config.getPayloadChecksums().getForType(XXHASH64), payloadChecksums.getForType(XXHASH64)); + assertEquals(config.getPayloadChecksums().getForType(MD5), payloadChecksums.getForType(MD5)); assertEquals(config.getGeneration(), generation); assertEquals(config.getDefContent(), defContent); } |