Skip to content

Commit 39b9122

Browse files
authored
Merge pull request #33121 from vespa-engine/hmusum/file-distribution-logging-changes
Minor changes to logging in file distribution
2 parents ae7f89d + 1bc49aa commit 39b9122

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,15 @@ public void serveFile(FileReference fileReference,
147147
Set<CompressionType> acceptedCompressionTypes,
148148
Request request,
149149
Receiver receiver) {
150-
log.log(Level.FINE, () -> "Received request for file reference '" + fileReference + "' from " + request.target());
150+
log.log(Level.FINE, () -> "Received request for file reference '" + fileReference + "' from " + request.target() +
151+
", download from other source: " + downloadFromOtherSourceIfNotFound);
151152
String client = request.target().toString();
152153
executor.execute(() -> {
153154
var result = serveFileInternal(fileReference, downloadFromOtherSourceIfNotFound, client, receiver, acceptedCompressionTypes);
154155
request.returnValues()
155156
.add(new Int32Value(result.code()))
156157
.add(new StringValue(result.description()));
158+
log.log(Level.FINE, () -> "Returning request for file reference '" + fileReference + "' from " + request.target());
157159
request.returnRequest();
158160
});
159161
}

filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ void startDownloadFromSource(FileReferenceDownload fileReferenceDownload, Spec s
125125
FileReference fileReference = fileReferenceDownload.fileReference();
126126
if (downloads.get(fileReference).isPresent()) return;
127127

128-
log.log(Level.FINE, () -> "Will download " + fileReference + " with timeout " + downloadTimeout);
129128
for (var connection : connectionPool.connections()) {
130129
if (connection.getAddress().equals(spec.toString()))
131130
downloadExecutor.submit(() -> {

0 commit comments

Comments
 (0)