diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-11 14:47:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-11 14:47:40 +0100 |
commit | c16a61293f1b77d9e341f61b96e4d96f7274ac0e (patch) | |
tree | ba803d55e733f80b5a183b38b6c19491103af379 | |
parent | 7d36fbe2d8aa7d8b531763e62fcd0cb43c54239c (diff) | |
parent | 5071cc4248db45b36c2bdc103ea78ce7aa50b9fb (diff) |
Merge pull request #4409 from vespa-engine/hmusum/reduce-log-levels
Reduce log level for some messages
3 files changed, 8 insertions, 16 deletions
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java index ca8b8c27ad3..32ae724cf0f 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java @@ -110,7 +110,7 @@ public class FileDownloader { private synchronized Future<Optional<File>> queueForDownload(FileReference fileReference, Duration timeout) { Future<Optional<File>> inProgress = fileReferenceDownloader.addDownloadListener(fileReference, () -> getFile(fileReference)); if (inProgress != null) { - log.log(LogLevel.INFO, "Already downloading '" + fileReference.value() + "'"); + log.log(LogLevel.DEBUG, "Already downloading '" + fileReference.value() + "'"); return inProgress; } 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 fa1519b972a..2df7c3a3313 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java @@ -181,8 +181,7 @@ public class FileReceiver { String errorDescription = req.parameters().get(6).asString(); if (errorCode == 0) { - // TODO: Remove when system test works - log.log(LogLevel.INFO, "Receiving file reference '" + fileReference.value() + "'"); + log.log(LogLevel.DEBUG, "Receiving file reference '" + fileReference.value() + "'"); receiveFile(new FileReferenceDataBlob(fileReference, filename, FileReferenceData.Type.valueOf(type), content, xxhash)); req.returnValues().add(new Int32Value(0)); } else { @@ -226,11 +225,11 @@ public class FileReceiver { private static void moveFileToDestination(File tempFile, File destination) { try { Files.move(tempFile.toPath(), destination.toPath()); - log.log(LogLevel.INFO, "File moved from " + tempFile.getAbsolutePath()+ " to " + destination.getAbsolutePath()); + log.log(LogLevel.DEBUG, "File moved from " + tempFile.getAbsolutePath()+ " to " + destination.getAbsolutePath()); } catch (FileAlreadyExistsException e) { // Don't fail if it already exists (we might get the file from several config servers when retrying, servers are down etc. // so it might be written already) - log.log(LogLevel.INFO, "File '" + destination.getAbsolutePath() + "' already exists, continuing: " + e.getMessage()); + log.log(LogLevel.DEBUG, "File '" + destination.getAbsolutePath() + "' already exists, continuing: " + e.getMessage()); } catch (IOException e) { String message = "Failed moving file '" + tempFile.getAbsolutePath() + "' to '" + destination.getAbsolutePath() + "'"; log.log(LogLevel.ERROR, message, e); @@ -240,7 +239,7 @@ public class FileReceiver { @SuppressWarnings({"UnusedDeclaration"}) public final void receiveFileMeta(Request req) { - log.info("Received method call '" + req.methodName() + "' with parameters : " + req.parameters()); + log.log(LogLevel.DEBUG, "Received method call '" + req.methodName() + "' with parameters : " + req.parameters()); FileReference reference = new FileReference(req.parameters().get(0).asString()); String fileName = req.parameters().get(1).asString(); String type = req.parameters().get(2).asString(); @@ -266,7 +265,7 @@ public class FileReceiver { @SuppressWarnings({"UnusedDeclaration"}) public final void receiveFilePart(Request req) { - log.info("Received method call '" + req.methodName() + "' with parameters : " + req.parameters()); + log.log(LogLevel.DEBUG, "Received method call '" + req.methodName() + "' with parameters : " + req.parameters()); FileReference reference = new FileReference(req.parameters().get(0).asString()); int sessionId = req.parameters().get(1).asInt32(); @@ -285,7 +284,7 @@ public class FileReceiver { @SuppressWarnings({"UnusedDeclaration"}) public final void receiveFileEof(Request req) { - log.info("Received method call '" + req.methodName() + "' with parameters : " + req.parameters()); + log.log(LogLevel.DEBUG, "Received method call '" + req.methodName() + "' with parameters : " + req.parameters()); FileReference reference = new FileReference(req.parameters().get(0).asString()); int sessionId = req.parameters().get(1).asInt32(); long xxhash = req.parameters().get(2).asInt64(); diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java index 3a9af23e6d8..60919ecb0cf 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java @@ -16,19 +16,12 @@ import java.io.File; import java.time.Duration; import java.util.HashMap; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.Map; import java.util.Optional; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.logging.Logger; -import java.util.stream.Collectors; /** * Downloads file reference using rpc requests to config server and keeps track of files being downloaded @@ -102,7 +95,7 @@ public class FileReferenceDownloader { downloads.remove(fileReference); download.future().set(Optional.of(file)); } else { - log.warning("Received a file " + fileReference + " I did not ask for. Impossible"); + log.log(LogLevel.WARNING, "Received a file " + fileReference + " I did not ask for. Impossible"); } } } |