LogLevel.SPAM -> Level.FINEST

23 files changed, 41 insertions, 41 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
index 1e66c397b88..4ae0fef015b 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
@@ -416,7 +416,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
      */
     public void handleFleetData(Map<Integer, Integer> data) {
         verifyInControllerThread();
-        log.log(LogLevel.SPAM, "Sending fleet data event on to master election handler");
+        log.log(Level.FINEST, "Sending fleet data event on to master election handler");
         metricUpdater.updateMasterElectionMetrics(data);
         masterElectionHandler.handleFleetData(data);
     }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java
index 8299e77e01a..1bfd86e9bc9 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java
@@ -109,7 +109,7 @@ public class MasterElectionHandler implements MasterInterface {
         if (totalCount == 1) return false; // No point in doing master election with only one node configured to be cluster controller
         if (nextMasterData == null) {
             if (masterCandidate == null) {
-                log.log(LogLevel.SPAM, "Cluster controller " + index + ": No current master candidate. Waiting for data to do master election.");
+                log.log(Level.FINEST, "Cluster controller " + index + ": No current master candidate. Waiting for data to do master election.");
             }
             return false; // Nothing have happened since last time.
         }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeInfo.java
index 12cfe979511..12a6d72d400 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeInfo.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeInfo.java
@@ -342,19 +342,19 @@ abstract public class NodeInfo implements Comparable<NodeInfo> {
             } else {
                 nextAttemptTime = time + 5000;
             }
-            log.log(LogLevel.SPAM, "Failed to get state from node " + toString() + ", scheduling next attempt in " + (nextAttemptTime - time) + " ms.");
+            log.log(Level.FINEST, "Failed to get state from node " + toString() + ", scheduling next attempt in " + (nextAttemptTime - time) + " ms.");
         } else {
             connectionAttemptCount = 0;
             timeOfFirstFailingConnectionAttempt = 0;
             reportedState = state;
             if (version == 0 || state.getState().equals(State.STOPPING)) {
                 nextAttemptTime = time + cluster.getPollingFrequency();
-                log.log(LogLevel.SPAM, "Scheduling next attempt to get state from " + toString() + " in " + (nextAttemptTime - time) + " ms (polling freq).");
+                log.log(Level.FINEST, "Scheduling next attempt to get state from " + toString() + " in " + (nextAttemptTime - time) + " ms (polling freq).");
             } else {
                 nextAttemptTime = time;
             }
         }
-        log.log(LogLevel.SPAM, "Set reported state of node " + this + " to " + reportedState + ". Next connection attempt is at " + nextAttemptTime);
+        log.log(Level.FINEST, "Set reported state of node " + this + " to " + reportedState + ". Next connection attempt is at " + nextAttemptTime);
     }
 
     /** Sets the wanted state. The wanted state is taken as UP if a null argument is given */
@@ -374,7 +374,7 @@ abstract public class NodeInfo implements Comparable<NodeInfo> {
             }
         }
         wantedState = newWanted;
-        log.log(LogLevel.SPAM, "Set wanted state of node " + this + " to " + wantedState + ".");
+        log.log(Level.FINEST, "Set wanted state of node " + this + " to " + wantedState + ".");
     }
 
     public long getTimeForNextStateRequestAttempt() {
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
index e9005509c52..85895b49efd 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
@@ -426,7 +426,7 @@ public class StateChangeHandler {
         if (initializationProgressHasIncreased(currentState, reportedState)) {
             node.setInitProgressTime(timeNow);
             if (log.isLoggable(LogLevel.SPAM)) {
-                log.log(LogLevel.SPAM, "Reset initialize timer on " + node + " to " + node.getInitProgressTime());
+                log.log(Level.FINEST, "Reset initialize timer on " + node + " to " + node.getInitProgressTime());
             }
         }
         if (handleImplicitCrashEdgeFromReverseInitProgress(node, currentState, reportedState, nodeListener, timeNow)) {
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java
index 28527162b71..8daa132ee5a 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java
@@ -138,7 +138,7 @@ public class MasterDataGatherer {
                 }
                 for(Integer vote : nextMasterData.values()) {
                     if (vote == null) {
-                        log.log(LogLevel.SPAM, "Fleetcontroller " + nodeIndex + ": Still not received votes from all fleet controllers. Awaiting more responses.");
+                        log.log(Level.FINEST, "Fleetcontroller " + nodeIndex + ": Still not received votes from all fleet controllers. Awaiting more responses.");
                         return;
                     }
                 }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
index a2d370a6fe8..834ecab9f5b 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
@@ -103,7 +103,7 @@ public class ZooKeeperDatabase extends Database {
         try{
             this.listener = zksl;
             setupRoot();
-            log.log(LogLevel.SPAM, "Fleetcontroller " + nodeIndex + ": Asking for initial data on master election");
+            log.log(Level.FINEST, "Fleetcontroller " + nodeIndex + ": Asking for initial data on master election");
             masterDataGatherer = new MasterDataGatherer(session, zooKeeperRoot, listener, nodeIndex);
             completedOk = true;
         } finally {
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java
index 5af1af519bb..643a6a94c50 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java
@@ -74,7 +74,7 @@ public class SlobrokClient implements NodeLookup {
             freshMirror = false;
         } else if (cluster.getSlobrokGenerationCount() == mirrorVersion) {
             if (log.isLoggable(LogLevel.SPAM)) {
-                log.log(LogLevel.SPAM, "Slobrok still at generation count " + cluster.getSlobrokGenerationCount() + ". Not updating.");
+                log.log(Level.FINEST, "Slobrok still at generation count " + cluster.getSlobrokGenerationCount() + ". Not updating.");
             }
             return false;
         }
@@ -151,7 +151,7 @@ public class SlobrokClient implements NodeLookup {
                 nodeInfo.markRpcAddressLive();
             }
         }
-        log.log(LogLevel.SPAM, "Slobrok information updated to generation " + cluster.getSlobrokGenerationCount());
+        log.log(Level.FINEST, "Slobrok information updated to generation " + cluster.getSlobrokGenerationCount());
         return true;
     }
 
@@ -196,7 +196,7 @@ public class SlobrokClient implements NodeLookup {
     private Map<Node, SlobrokData> getSlobrokData(String pattern) {
         Map<Node, SlobrokData> result = new TreeMap<>();
         List<Mirror.Entry> entries = mirror.lookup(pattern);
-        log.log(LogLevel.SPAM, "Looking for slobrok entries with pattern '" + pattern + "'. Found " + entries.size() + " entries.");
+        log.log(Level.FINEST, "Looking for slobrok entries with pattern '" + pattern + "'. Found " + entries.size() + " entries.");
         for (Mirror.Entry entry : entries) {
             StringTokenizer st = new StringTokenizer(entry.getName(), "/");
             String addressType = st.nextToken();
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
index 8e6cbc28a85..19181f2d1eb 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
@@ -58,7 +58,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
         if (ssocket != null && ssocket.isBound() && (ssocket.getLocalPort() == port || port == 0)) {
             return true;
         } else {
-            log.log(LogLevel.SPAM, "Status page server socket is no longer connected: "+ (ssocket != null) + " " + ssocket.isBound() + " " + ssocket.getLocalPort() + " " + port);
+            log.log(Level.FINEST, "Status page server socket is no longer connected: "+ (ssocket != null) + " " + ssocket.isBound() + " " + ssocket.getLocalPort() + " " + port);
             return false;
         }
     }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
index d6959ed1952..a596df164af 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
@@ -402,7 +402,7 @@ public class DummyVdsNode {
 
     private void rpc_storageConnect(Request req) {
         synchronized(timer) {
-            log.log(LogLevel.SPAM, "Dummy node " + this + " got old type handle connect message.");
+            log.log(Level.FINEST, "Dummy node " + this + " got old type handle connect message.");
             req.returnValues().add(new Int32Value(0));
             negotiatedHandle = true;
         }
diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
index fc602ca8dcd..4f811f90ed9 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
@@ -218,13 +218,13 @@ public abstract class AbstractConfigProducer<CHILD extends AbstractConfigProduce
         }
 
         if (log.isLoggable(LogLevel.SPAM)) {
-            log.log(LogLevel.SPAM, "User configs is: " + userConfigs.toString());
+            log.log(Level.FINEST, "User configs is: " + userConfigs.toString());
         }
         // TODO: What do we do with md5. Currently ignored for user configs?
         ConfigDefinitionKey key = new ConfigDefinitionKey(builder.getDefName(), builder.getDefNamespace());
         if (userConfigs.get(key) != null) {
             if (log.isLoggable(LogLevel.SPAM)) {
-                log.log(LogLevel.SPAM, "Apply in " + configId);
+                log.log(Level.FINEST, "Apply in " + configId);
             }
             applyUserConfig(builder, userConfigs.get(key));
             didApply = true;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
index 03b09a2bf2d..00549cc3a99 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
@@ -24,7 +24,7 @@ public class UserConfigBuilder {
     public static UserConfigRepo build(Element producerSpec, ConfigDefinitionStore configDefinitionStore, DeployLogger deployLogger) {
         final Map<ConfigDefinitionKey, ConfigPayloadBuilder> builderMap = new LinkedHashMap<>();
         if (producerSpec == null) {
-            log.log(LogLevel.SPAM, "In getUserConfigs. producerSpec is null");
+            log.log(Level.FINEST, "In getUserConfigs. producerSpec is null");
         }
         log.log(Level.FINE, "getUserConfigs for " + producerSpec);
         for (Element configE : XML.getChildren(producerSpec, "config")) {
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 c8b16f5376a..1399c3677af 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
@@ -247,10 +247,10 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
 
     private void dispatchRpcRequest(Request request, Runnable handler) {
         request.detach();
-        log.log(LogLevel.SPAM, () -> String.format("Dispatching RPC request %s", requestLogId(request)));
+        log.log(Level.FINEST, () -> String.format("Dispatching RPC request %s", requestLogId(request)));
         rpcExecutor.execute(() -> {
             try {
-                log.log(LogLevel.SPAM, () -> String.format("Executing RPC request %s.", requestLogId(request)));
+                log.log(Level.FINEST, () -> String.format("Executing RPC request %s.", requestLogId(request)));
                 handler.run();
             } catch (Exception e) {
                 log.log(LogLevel.WARNING,
@@ -280,11 +280,11 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
         try {
             RawConfig config = proxyServer.resolveConfig(request);
             if (config == null) {
-                log.log(LogLevel.SPAM, () -> "No config received yet for " + request.getShortDescription() + ", not sending response");
+                log.log(Level.FINEST, () -> "No config received yet for " + request.getShortDescription() + ", not sending response");
             } else if (ProxyServer.configOrGenerationHasChanged(config, request)) {
                 returnOkResponse(request, config);
             } else {
-                log.log(LogLevel.SPAM, "No new config for " + request.getShortDescription() + ", not sending response");
+                log.log(Level.FINEST, "No new config for " + request.getShortDescription() + ", not sending response");
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -353,7 +353,7 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
         request.addOkResponse(config.getPayload(), config.getGeneration(), config.isInternalRedeploy(), config.getConfigMd5());
         log.log(Level.FINE, () -> "Return response: " + request.getShortDescription() + ",configMd5=" + config.getConfigMd5() +
                 ",generation=" + config.getGeneration());
-        log.log(LogLevel.SPAM, () -> "Config payload in response for " + request.getShortDescription() + ":" + config.getPayload());
+        log.log(Level.FINEST, () -> "Config payload in response for " + request.getShortDescription() + ":" + config.getPayload());
 
 
         // TODO Catch exception for now, since the request might have been returned in CheckDelayedResponse
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 d9d2de2fac2..42bb2d21b55 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
@@ -38,7 +38,7 @@ public class DelayedResponseHandler implements Runnable {
     void checkDelayedResponses() {
         try {
             long start = System.currentTimeMillis();
-            log.log(LogLevel.SPAM, () -> "Running DelayedResponseHandler. There are " + delayedResponses.size() +
+            log.log(Level.FINEST, () -> "Running DelayedResponseHandler. There are " + delayedResponses.size() +
                     " delayed responses. First one is " + delayedResponses.responses().peek());
             DelayedResponse response;
             AtomicInteger i = new AtomicInteger(0);
@@ -54,7 +54,7 @@ public class DelayedResponseHandler implements Runnable {
                             request.getConfigKey() + ", will retry");
                 }
             }
-            log.log(LogLevel.SPAM, () -> "Finished running DelayedResponseHandler. " + i.get() + " delayed responses sent in " +
+            log.log(Level.FINEST, () -> "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));
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 d37408f97b3..31fd8a2682a 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
@@ -134,9 +134,9 @@ class RpcConfigSourceClient implements ConfigSourceClient {
         if (cachedConfig != null) {
             log.log(Level.FINE, () -> "Found config " + configCacheKey + " in cache, generation=" + cachedConfig.getGeneration() +
                     ",configmd5=" + cachedConfig.getConfigMd5());
-            log.log(LogLevel.SPAM, () -> "input config=" + input + ",cached config=" + cachedConfig);
+            log.log(Level.FINEST, () -> "input config=" + input + ",cached config=" + cachedConfig);
             if (ProxyServer.configOrGenerationHasChanged(cachedConfig, request)) {
-                log.log(LogLevel.SPAM, () -> "Cached config is not equal to requested, will return it");
+                log.log(Level.FINEST, () -> "Cached config is not equal to requested, will return it");
                 if (delayedResponses.remove(delayedResponse)) {
                     // unless another thread already did it
                     ret = cachedConfig;
@@ -217,7 +217,7 @@ class RpcConfigSourceClient implements ConfigSourceClient {
     public void updateSubscribers(RawConfig config) {
         log.log(Level.FINE, () -> "Config updated for " + config.getKey() + "," + config.getGeneration());
         DelayQueue<DelayedResponse> responseDelayQueue = delayedResponses.responses();
-        log.log(LogLevel.SPAM, () -> "Delayed response queue: " + responseDelayQueue);
+        log.log(Level.FINEST, () -> "Delayed response queue: " + responseDelayQueue);
         if (responseDelayQueue.size() == 0) {
             log.log(Level.FINE, () -> "There exists no matching element on delayed response queue for " + config.getKey());
             return;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index 6082e4d34e5..e5918d19bc0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -157,7 +157,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
      */
     private void getConfigV3(Request req) {
         if (log.isLoggable(LogLevel.SPAM)) {
-            log.log(LogLevel.SPAM, getConfigMethodName);
+            log.log(Level.FINEST, getConfigMethodName);
         }
         req.detach();
         rpcAuthorizer.authorizeConfigRequest(req)
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java
index 9e7576ae8f5..a52788031c7 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java
@@ -43,7 +43,7 @@ public class DeployHandlerLoggerTest {
 
     private void logMessages(DeployLogger logger) {
         logger.log(Level.FINE, "foobar");
-        logger.log(LogLevel.SPAM, "foobar");
+        logger.log(Level.FINEST, "foobar");
         logger.log(LogLevel.FINE, "baz");
         logger.log(LogLevel.WARNING, "baz");
     }
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
index f7c8c646bb4..edfc12f3efa 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
@@ -385,7 +385,7 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
 
     public void onSearchResult(SearchResult sr) {
         if (log.isLoggable(LogLevel.SPAM)) {
-            log.log(LogLevel.SPAM, "Got SearchResult for query with selection " + params.getDocumentSelection());
+            log.log(Level.FINEST, "Got SearchResult for query with selection " + params.getDocumentSelection());
         }
         handleSearchResult(sr);
     }
@@ -413,14 +413,14 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
 
     private void mergeGroupingMaps(Map<Integer, byte []> newGroupingMap) {
         if (log.isLoggable(LogLevel.SPAM)) {
-            log.log(LogLevel.SPAM, "mergeGroupingMaps: newGroupingMap = " + newGroupingMap);
+            log.log(Level.FINEST, "mergeGroupingMaps: newGroupingMap = " + newGroupingMap);
         }
         for(Integer key : newGroupingMap.keySet()) {
             byte [] value = newGroupingMap.get(key);
 
             Grouping newGrouping = new Grouping();
             if (log.isLoggable(LogLevel.SPAM)) {
-                log.log(LogLevel.SPAM, "Received group with key " + key + " and size " + value.length);
+                log.log(Level.FINEST, "Received group with key " + key + " and size " + value.length);
             }
             BufferSerializer buf = new BufferSerializer( new GrowableByteBuffer(ByteBuffer.wrap(value)) );
             newGrouping.deserialize(buf);
@@ -441,7 +441,7 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
 
     public void onDocumentSummary(DocumentSummary ds) {
         if (log.isLoggable(LogLevel.SPAM)) {
-            log.log(LogLevel.SPAM, "Got DocumentSummary for query with selection " + params.getDocumentSelection());
+            log.log(Level.FINEST, "Got DocumentSummary for query with selection " + params.getDocumentSelection());
         }
         handleSummary(ds);
     }
diff --git a/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java b/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java
index fd1b81fce40..ae636e12ba9 100644
--- a/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java
+++ b/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java
@@ -150,7 +150,7 @@ public class DocprocExecutor {
             }
         }
         message.append("]");
-        log.log(LogLevel.SPAM, message.toString());
+        log.log(Level.FINEST, message.toString());
     }
 
     /**
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java b/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java
index eea3d6e66e8..b7c78e28dbe 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java
@@ -368,7 +368,7 @@ public class ProgressToken {
             return;
         }
         if (log.isLoggable(LogLevel.SPAM)) {
-            log.log(LogLevel.SPAM, "Adding bucket pair " + superbucket
+            log.log(Level.FINEST, "Adding bucket pair " + superbucket
                     + ":" + progress + " with state " + state);
         }
 
@@ -790,7 +790,7 @@ public class ProgressToken {
             if (rightSibling != null) {
                 assert(rightSibling.getState() == BucketState.BUCKET_PENDING);
                 if (log.isLoggable(LogLevel.SPAM)) {
-                    log.log(LogLevel.SPAM, "Merging " + bucket + " with rhs " + rightCheck);
+                    log.log(Level.FINEST, "Merging " + bucket + " with rhs " + rightCheck);
                 }
                 // If right sibling has progress, it will unfortunately have to
                 // be discarded
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorIterator.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorIterator.java
index ecf6d640ef7..05324d957b8 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorIterator.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorIterator.java
@@ -246,7 +246,7 @@ public class VisitorIterator {
                                     lastMergedBucket.getId() | (1L << (lastMergedBucket.getUsedBits() - 1)));
                             if (pending.equals(rightCheck)) {
                                 if (log.isLoggable(LogLevel.SPAM)) {
-                                    log.log(LogLevel.SPAM, "Skipped " + pending +
+                                    log.log(Level.FINEST, "Skipped " + pending +
                                             ", as it was right sibling of " + lastMergedBucket);
                                 }
                                 continue;
@@ -286,7 +286,7 @@ public class VisitorIterator {
                 }
             }
             if (log.isLoggable(LogLevel.SPAM)) {
-                log.log(LogLevel.SPAM, "New range bucket cursor is " +
+                log.log(Level.FINEST, "New range bucket cursor is " +
                         progressToken.getBucketCursor());
             }
         }
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
index a79f3831c17..2db66f6c859 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
@@ -255,7 +255,7 @@ public class FileReceiver {
             retval = 1;
         }
         double completeness = (double) session.currentFileSize / (double) session.fileSize;
-        log.log(LogLevel.SPAM, () -> String.format("%.1f percent of '%s' downloaded", completeness * 100, reference.value()));
+        log.log(Level.FINEST, () -> String.format("%.1f percent of '%s' downloaded", completeness * 100, reference.value()));
         downloader.setDownloadStatus(reference, completeness);
         req.returnValues().add(new Int32Value(retval));
     }
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/SendProxy.java b/messagebus/src/main/java/com/yahoo/messagebus/SendProxy.java
index 77bbd662cc4..d90cd2fb3da 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/SendProxy.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/SendProxy.java
@@ -61,7 +61,7 @@ public class SendProxy implements MessageHandler, ReplyHandler {
                 if (reply.hasErrors()) {
                     log.log(Level.FINE, "Trace for reply with error(s):\n" + reply.getTrace());
                 } else if (log.isLoggable(LogLevel.SPAM)) {
-                    log.log(LogLevel.SPAM, "Trace for reply:\n" + reply.getTrace());
+                    log.log(Level.FINEST, "Trace for reply:\n" + reply.getTrace());
                 }
                 Trace empty = new Trace();
                 trace.swap(empty);
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java
index 54307f01258..aa2849a027b 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/SharedSender.java
@@ -125,7 +125,7 @@ public class SharedSender implements ReplyHandler {
                 metrics.addReply(r);
             }
             if (log.isLoggable(LogLevel.SPAM)) {
-                log.log(LogLevel.SPAM, "Received reply for file " + owner.toString() + " count was " + owner.getPending().val());
+                log.log(Level.FINEST, "Received reply for file " + owner.toString() + " count was " + owner.getPending().val());
             }
             if (owner.isAborted()) {
                 log.log(Level.FINE, "Received reply for file " + owner.toString() + " which is aborted");