From 058af5c4579d8975cfaf564f0eae4b52dbaae1f4 Mon Sep 17 00:00:00 2001 From: Akshat Jain Date: Wed, 7 Aug 2024 14:26:50 +0530 Subject: [PATCH 1/3] Reduce logging in RetryableS3OutputStream --- .../druid/storage/s3/output/RetryableS3OutputStream.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java index aa672444581a..1f0ddc1c4c2d 100644 --- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java @@ -212,11 +212,10 @@ public void close() throws IOException // Closeables are closed in LIFO order closer.register(() -> { org.apache.commons.io.FileUtils.forceDelete(chunkStorePath); - LOG.info("Deleted chunkStorePath[%s]", chunkStorePath); final long totalBytesUploaded = (currentChunk.id - 1) * chunkSize + currentChunk.length(); final long totalUploadTimeMillis = pushStopwatch.elapsed(TimeUnit.MILLISECONDS); - LOG.info( + LOG.debug( "Pushed total [%d] parts containing [%d] bytes in [%d]ms for s3Key[%s], uploadId[%s].", futures.size(), totalBytesUploaded, From 7d908a0e4f1320cfd233b5298f074924ea23659f Mon Sep 17 00:00:00 2001 From: Akshat Jain Date: Wed, 7 Aug 2024 14:43:09 +0530 Subject: [PATCH 2/3] Wrap the log inside isDebugEnabled --- .../s3/output/RetryableS3OutputStream.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java index 1f0ddc1c4c2d..72440fb4c767 100644 --- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java @@ -215,14 +215,16 @@ public void close() throws IOException final long totalBytesUploaded = (currentChunk.id - 1) * chunkSize + currentChunk.length(); final long totalUploadTimeMillis = pushStopwatch.elapsed(TimeUnit.MILLISECONDS); - LOG.debug( - "Pushed total [%d] parts containing [%d] bytes in [%d]ms for s3Key[%s], uploadId[%s].", - futures.size(), - totalBytesUploaded, - totalUploadTimeMillis, - s3Key, - uploadId - ); + if (LOG.isDebugEnabled()) { + LOG.debug( + "Pushed total [%d] parts containing [%d] bytes in [%d]ms for s3Key[%s], uploadId[%s].", + futures.size(), + totalBytesUploaded, + totalUploadTimeMillis, + s3Key, + uploadId + ); + } final ServiceMetricEvent.Builder builder = new ServiceMetricEvent.Builder().setDimension("uploadId", uploadId); uploadManager.emitMetric(builder.setMetric(METRIC_TOTAL_UPLOAD_TIME, totalUploadTimeMillis)); From 0a14e73312d8adbd792a583ced959fee612ed697 Mon Sep 17 00:00:00 2001 From: Akshat Jain Date: Wed, 7 Aug 2024 17:53:34 +0530 Subject: [PATCH 3/3] Revert "Wrap the log inside isDebugEnabled" This reverts commit 7d908a0e4f1320cfd233b5298f074924ea23659f. --- .../s3/output/RetryableS3OutputStream.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java index 72440fb4c767..1f0ddc1c4c2d 100644 --- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java +++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java @@ -215,16 +215,14 @@ public void close() throws IOException final long totalBytesUploaded = (currentChunk.id - 1) * chunkSize + currentChunk.length(); final long totalUploadTimeMillis = pushStopwatch.elapsed(TimeUnit.MILLISECONDS); - if (LOG.isDebugEnabled()) { - LOG.debug( - "Pushed total [%d] parts containing [%d] bytes in [%d]ms for s3Key[%s], uploadId[%s].", - futures.size(), - totalBytesUploaded, - totalUploadTimeMillis, - s3Key, - uploadId - ); - } + LOG.debug( + "Pushed total [%d] parts containing [%d] bytes in [%d]ms for s3Key[%s], uploadId[%s].", + futures.size(), + totalBytesUploaded, + totalUploadTimeMillis, + s3Key, + uploadId + ); final ServiceMetricEvent.Builder builder = new ServiceMetricEvent.Builder().setDimension("uploadId", uploadId); uploadManager.emitMetric(builder.setMetric(METRIC_TOTAL_UPLOAD_TIME, totalUploadTimeMillis));