Akshat-Jain commented on code in PR #16481:
URL: https://github.com/apache/druid/pull/16481#discussion_r1617223785
##########
extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/RetryableS3OutputStream.java:
##########
@@ -271,50 +328,72 @@ public void close() throws IOException
// This should be emitted as a metric
LOG.info(
"Pushed total [%d] parts containing [%d] bytes in [%d]ms.",
- numChunksPushed,
- resultsSize,
+ numChunksPushed.get(),
+ resultsSize.get(),
pushStopwatch.elapsed(TimeUnit.MILLISECONDS)
);
});
- closer.register(() ->
org.apache.commons.io.FileUtils.forceDelete(chunkStorePath));
+ try (Closer ignored = closer) {
+ if (!error) {
+ pushCurrentChunk();
+ completeMultipartUpload();
+ }
+ }
+ }
- closer.register(() -> {
- try {
- if (resultsSize > 0 && isAllPushSucceeded()) {
- RetryUtils.retry(
- () -> s3.completeMultipartUpload(
- new CompleteMultipartUploadRequest(config.getBucket(),
s3Key, uploadId, pushResults)
- ),
- S3Utils.S3RETRY,
- config.getMaxRetry()
- );
- } else {
- RetryUtils.retry(
- () -> {
- s3.cancelMultiPartUpload(new
AbortMultipartUploadRequest(config.getBucket(), s3Key, uploadId));
- return null;
- },
- S3Utils.S3RETRY,
- config.getMaxRetry()
- );
+ private void completeMultipartUpload()
+ {
+ synchronized (fileLock) {
+ while (pendingFiles.get() > 0) {
+ try {
+ LOG.info("Waiting for lock for completing multipart task for
uploadId [%s].", uploadId);
Review Comment:
Fair enough, changed it to `LOG.debug()`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
