This is an automated email from the ASF dual-hosted git repository. dimuthuupe pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
commit d8cf348886735fe92d16f1c0b2c5d83e7741ce5a Author: DImuthuUpe <[email protected]> AuthorDate: Fri Sep 1 23:40:51 2023 +0530 Minor optimizations --- .../java/org/apache/airavata/mft/agent/TransportMediator.java | 9 ++++++--- .../apache/airavata/mft/transport/s3/S3OutgoingConnector.java | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/agent/service/src/main/java/org/apache/airavata/mft/agent/TransportMediator.java b/agent/service/src/main/java/org/apache/airavata/mft/agent/TransportMediator.java index 42c0630..0f55b4a 100644 --- a/agent/service/src/main/java/org/apache/airavata/mft/agent/TransportMediator.java +++ b/agent/service/src/main/java/org/apache/airavata/mft/agent/TransportMediator.java @@ -280,9 +280,12 @@ public class TransportMediator { uploader.uploadChunk(chunkIdx, startPos, endPos, inputStream); } else { String tempFile = tempDataDir + File.separator + UUID.randomUUID().toString() + "-" + chunkIdx; - downloader.downloadChunk(chunkIdx, startPos, endPos, tempFile); - uploader.uploadChunk(chunkIdx, startPos, endPos, tempFile); - new File(tempFile).delete(); + try { + downloader.downloadChunk(chunkIdx, startPos, endPos, tempFile); + uploader.uploadChunk(chunkIdx, startPos, endPos, tempFile); + } finally { + new File(tempFile).delete(); + } } return chunkIdx; } catch (Exception e) { diff --git a/transport/s3-transport/src/main/java/org/apache/airavata/mft/transport/s3/S3OutgoingConnector.java b/transport/s3-transport/src/main/java/org/apache/airavata/mft/transport/s3/S3OutgoingConnector.java index 6cc17d4..cc3d6d2 100644 --- a/transport/s3-transport/src/main/java/org/apache/airavata/mft/transport/s3/S3OutgoingConnector.java +++ b/transport/s3-transport/src/main/java/org/apache/airavata/mft/transport/s3/S3OutgoingConnector.java @@ -92,10 +92,10 @@ public class S3OutgoingConnector implements OutgoingChunkedConnector { .withUploadId(initResponse.getUploadId()) .withPartNumber(chunkId + 1) .withFileOffset(0) - //.withMD5Digest(Md5Utils.md5AsBase64(new File(uploadFile))) -// .withFile(file) - .withInputStream(new BufferedInputStream(new FileInputStream(file), Math.min(16 * 1024 * 1024, (int) ( endByte - startByte)))) - .withPartSize(file.length()); + .withFile(file) + .withMD5Digest(Md5Utils.md5AsBase64(new File(uploadFile))) + //.withInputStream(new BufferedInputStream(new FileInputStream(file), Math.min(16 * 1024 * 1024, (int) ( endByte - startByte)))) + .withPartSize(endByte - startByte); UploadPartResult uploadResult = s3Client.uploadPart(uploadRequest); this.partETags.add(uploadResult.getPartETag());
