diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-02-08 10:43:04 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-02-08 10:43:04 +0100 |
commit | e8fc7dcca61334af97da1ccee4bfe72d6939d0e3 (patch) | |
tree | a42e8de7f94e5e918d8668ffb8c4bfe43ebeeafc /config-proxy/src/main | |
parent | bfad2de3e5b88bdb733e5a10639a281e6c4e2f42 (diff) |
Minor cleanup, no functional changes
Diffstat (limited to 'config-proxy/src/main')
6 files changed, 21 insertions, 36 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyStatistics.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyStatistics.java index d8439bce794..314a4b0cb11 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyStatistics.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyStatistics.java @@ -9,7 +9,6 @@ import com.yahoo.log.event.Event; * //TODO Use metrics framework * * @author hmusum - * @since 5.1.7 */ class ConfigProxyStatistics implements Runnable { static final long defaultEventInterval = 5 * 60; // in seconds diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java index 59dca6e7104..ac0c036774b 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java @@ -7,7 +7,7 @@ import com.yahoo.yolean.Exceptions; import com.yahoo.vespa.config.ConfigCacheKey; import com.yahoo.vespa.config.RawConfig; -import java.util.Date; +import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; /** @@ -38,31 +38,24 @@ public class DelayedResponseHandler implements Runnable { void checkDelayedResponses() { try { long start = System.currentTimeMillis(); - if (log.isLoggable(LogLevel.SPAM)) { - log.log(LogLevel.SPAM, "Running DelayedResponseHandler. There are " + delayedResponses.size() + " delayed responses. First one is " + delayedResponses.responses().peek()); - } + log.log(LogLevel.SPAM, () -> "Running DelayedResponseHandler. There are " + delayedResponses.size() + + " delayed responses. First one is " + delayedResponses.responses().peek()); DelayedResponse response; - int i = 0; - + AtomicInteger i = new AtomicInteger(0); while ((response = delayedResponses.responses().poll()) != null) { - if (log.isLoggable(LogLevel.DEBUG)) { - log.log(LogLevel.DEBUG, "Returning with response that has return time " + new Date(response.getReturnTime())); - } JRTServerConfigRequest request = response.getRequest(); ConfigCacheKey cacheKey = new ConfigCacheKey(request.getConfigKey(), request.getConfigKey().getMd5()); RawConfig config = memoryCache.get(cacheKey); if (config != null) { rpcServer.returnOkResponse(request, config); - i++; + i.incrementAndGet(); } else { log.log(LogLevel.WARNING, "Timed out (timeout " + request.getTimeout() + ") getting config " + request.getConfigKey() + ", will retry"); } } - if (log.isLoggable(LogLevel.SPAM)) { - log.log(LogLevel.SPAM, "Finished running DelayedResponseHandler. " + i + " delayed responses sent in " + - (System.currentTimeMillis() - start) + " ms"); - } + log.log(LogLevel.SPAM, () -> "Finished running DelayedResponseHandler. " + i.get() + " delayed responses sent in " + + (System.currentTimeMillis() - start) + " ms"); } catch (Exception e) { // To avoid thread throwing exception and executor never running this again log.log(LogLevel.WARNING, "Got exception in DelayedResponseHandler: " + Exceptions.toMessageString(e)); } catch (Throwable e) { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java index b226131120c..da6e7d975cb 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java @@ -21,15 +21,15 @@ class Mode { DEFAULT, MEMORYCACHE } - public Mode() { + Mode() { this(ModeName.DEFAULT); } - public Mode(ModeName modeName) { + Mode(ModeName modeName) { mode = modeName; } - public Mode(String modeString) { + Mode(String modeString) { switch (modeString.toLowerCase()) { case "" : mode = ModeName.DEFAULT; @@ -45,23 +45,23 @@ class Mode { } } - public ModeName getMode() { + ModeName getMode() { return mode; } - public boolean isDefault() { + boolean isDefault() { return mode.equals(ModeName.DEFAULT); } - public boolean isMemoryCache() { + boolean isMemoryCache() { return mode.equals(ModeName.MEMORYCACHE); } - public boolean requiresConfigSource() { + boolean requiresConfigSource() { return mode.equals(ModeName.DEFAULT); } - public static boolean validModeName(String modeString) { + static boolean validModeName(String modeString) { return (modeString != null) && modes().contains(modeString); } @@ -73,7 +73,7 @@ class Mode { return modes; } - public String name() { + String name() { return mode.name().toLowerCase(); } diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java index 16d1cb6855b..40526641855 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java @@ -60,7 +60,6 @@ public class ProxyServer implements Runnable { private static final double timingValuesRatio = 0.8; private final static TimingValues defaultTimingValues; private final boolean delayedResponseHandling; - private final FileDownloader fileDownloader; private volatile Mode mode = new Mode(DEFAULT); @@ -88,8 +87,7 @@ public class ProxyServer implements Runnable { this.rpcServer = createRpcServer(spec); clientUpdater = new ClientUpdater(rpcServer, statistics, delayedResponses); this.configClient = createClient(clientUpdater, delayedResponses, source, timingValues, memoryCache, configClient); - this.fileDownloader = new FileDownloader(new JRTConnectionPool(source)); - new FileDistributionRpcServer(supervisor, fileDownloader); + new FileDistributionRpcServer(supervisor, new FileDownloader(new JRTConnectionPool(source))); new UrlDownloadRpcServer(supervisor); } @@ -288,7 +286,4 @@ public class ProxyServer implements Runnable { configClient = createRpcClient(); } - FileDownloader fileDownloader() { - return fileDownloader; - } } diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java index ceaf57e9cf1..7e27b19bda2 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java @@ -66,11 +66,9 @@ public class UpstreamConfigSubscriber implements Subscriber { private void updateWithNewConfig(GenericConfigHandle handle) { RawConfig newConfig = handle.getRawConfig(); - if (log.isLoggable(LogLevel.DEBUG)) { - log.log(LogLevel.DEBUG, "config to be returned for '" + newConfig.getKey() + - "', generation=" + newConfig.getGeneration() + - ", payload=" + newConfig.getPayload()); - } + log.log(LogLevel.DEBUG, () -> "config to be returned for '" + newConfig.getKey() + + "', generation=" + newConfig.getGeneration() + + ", payload=" + newConfig.getPayload()); memoryCache.put(newConfig); clientUpdater.updateSubscribers(newConfig); } diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UrlDownloadRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UrlDownloadRpcServer.java index d8688d5cc36..f9469b1ae65 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UrlDownloadRpcServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UrlDownloadRpcServer.java @@ -47,7 +47,7 @@ public class UrlDownloadRpcServer { private final ExecutorService rpcDownloadExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), new DaemonThreadFactory("Rpc download executor")); - public UrlDownloadRpcServer(Supervisor supervisor) { + UrlDownloadRpcServer(Supervisor supervisor) { supervisor.addMethod(new Method("url.waitFor", "s", "s", this, "download") .methodDesc("get path to url download") .paramDesc(0, "url", "url") |