From 31fdb98aade5ad76d81fa68e437e9ab2d40b0674 Mon Sep 17 00:00:00 2001 From: Chris Bevard Date: Mon, 17 Apr 2023 10:40:19 -0400 Subject: [PATCH 1/9] downgrade to flush() instead of no-op. --- .../org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java | 3 ++- .../org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java index df3c9315ba85f..8bc0ab2ce382e 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java @@ -726,7 +726,7 @@ public void hsync() throws IOException { /** * Shared processing of Syncable operation reporting/downgrade. */ - private void handleSyncableInvocation() { + private void handleSyncableInvocation() throws IOException { final UnsupportedOperationException ex = new UnsupportedOperationException(E_NOT_SYNCABLE); if (!downgradeSyncableExceptions) { @@ -738,6 +738,7 @@ private void handleSyncableInvocation() { key); // and log at debug LOG.debug("Downgrading Syncable call", ex); + flush(); } @Override diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java index ffa2c81e58adf..27f49f2c658ef 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java @@ -38,7 +38,10 @@ import static org.apache.hadoop.test.LambdaTestUtils.intercept; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** @@ -156,6 +159,7 @@ public void testSyncableUnsupported() throws Exception { stream = spy(new S3ABlockOutputStream(builder)); intercept(UnsupportedOperationException.class, () -> stream.hflush()); intercept(UnsupportedOperationException.class, () -> stream.hsync()); + verify(stream, never()).flush(); } /** @@ -169,8 +173,11 @@ public void testSyncableDowngrade() throws Exception { builder.withDowngradeSyncableExceptions(true); stream = spy(new S3ABlockOutputStream(builder)); + verify(stream, never()).flush(); stream.hflush(); + verify(stream, times(1)).flush(); stream.hsync(); + verify(stream, times(2)).flush(); } } From 4b37471821b11847b416c107657f8b216eda0bc6 Mon Sep 17 00:00:00 2001 From: Chris Bevard Date: Mon, 17 Apr 2023 12:31:02 -0400 Subject: [PATCH 2/9] include key in s3a disk buffer file name --- .../hadoop/fs/s3a/S3ABlockOutputStream.java | 2 +- .../apache/hadoop/fs/s3a/S3ADataBlocks.java | 26 +++++++++++++------ .../fs/s3a/ITestS3ABlockOutputArray.java | 2 +- .../apache/hadoop/fs/s3a/TestDataBlocks.java | 2 +- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java index 8bc0ab2ce382e..73da79a30391d 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java @@ -232,7 +232,7 @@ private synchronized S3ADataBlocks.DataBlock createBlockIfNeeded() LOG.error("Number of partitions in stream exceeds limit for S3: " + Constants.MAX_MULTIPART_COUNT + " write may fail."); } - activeBlock = blockFactory.create(blockCount, this.blockSize, statistics); + activeBlock = blockFactory.create(key, blockCount, this.blockSize, statistics); } return activeBlock; } diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java index ddaf059b055de..63b0bdd33c488 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java @@ -175,12 +175,13 @@ protected BlockFactory(S3AFileSystem owner) { /** * Create a block. * + * @param key of s3 object being written to * @param index index of block * @param limit limit of the block. * @param statistics stats to work with * @return a new block. */ - abstract DataBlock create(long index, long limit, + abstract DataBlock create(String key, long index, long limit, BlockOutputStreamStatistics statistics) throws IOException; @@ -391,11 +392,11 @@ static class ArrayBlockFactory extends BlockFactory { } @Override - DataBlock create(long index, long limit, + DataBlock create(String key, long index, long limit, BlockOutputStreamStatistics statistics) throws IOException { Preconditions.checkArgument(limit > 0, - "Invalid block size: %d", limit); + "Invalid block size: %d [%s]", limit, key); return new ByteArrayBlock(0, limit, statistics); } @@ -516,11 +517,11 @@ static class ByteBufferBlockFactory extends BlockFactory { } @Override - ByteBufferBlock create(long index, long limit, + ByteBufferBlock create(String key, long index, long limit, BlockOutputStreamStatistics statistics) throws IOException { Preconditions.checkArgument(limit > 0, - "Invalid block size: %d", limit); + "Invalid block size: %d [%s]", limit, key); return new ByteBufferBlock(index, limit, statistics); } @@ -798,6 +799,8 @@ public String toString() { * Buffer blocks to disk. */ static class DiskBlockFactory extends BlockFactory { + private static final String ESCAPED_FORWARD_SLASH = "EFS"; + private static final String ESCAPED_BACKSLASH = "EBS"; DiskBlockFactory(S3AFileSystem owner) { super(owner); @@ -806,6 +809,7 @@ static class DiskBlockFactory extends BlockFactory { /** * Create a temp file and a {@link DiskBlock} instance to manage it. * + * @param key of the s3 object being written * @param index block index * @param limit limit of the block. -1 means "no limit" * @param statistics statistics to update @@ -813,17 +817,23 @@ static class DiskBlockFactory extends BlockFactory { * @throws IOException IO problems */ @Override - DataBlock create(long index, + DataBlock create(String key, long index, long limit, BlockOutputStreamStatistics statistics) throws IOException { Preconditions.checkArgument(limit != 0, - "Invalid block size: %d", limit); + "Invalid block size: %d [%s]", limit, key); File destFile = getOwner() - .createTmpFileForWrite(String.format("s3ablock-%04d-", index), + .createTmpFileForWrite(String.format("s3ablock-%04d-%s-", index, escapeS3Key(key)), limit, getOwner().getConf()); return new DiskBlock(destFile, limit, index, statistics); } + + protected static String escapeS3Key(String key) { + return key + .replace("\\", ESCAPED_BACKSLASH) + .replace("/", ESCAPED_FORWARD_SLASH); + } } /** diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java index 53fa0d83b55a7..aeb1da248ea7c 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java @@ -136,7 +136,7 @@ private void markAndResetDatablock(S3ADataBlocks.BlockFactory factory) new S3AInstrumentation(new URI("s3a://example")); BlockOutputStreamStatistics outstats = instrumentation.newOutputStreamStatistics(null); - S3ADataBlocks.DataBlock block = factory.create(1, BLOCK_SIZE, outstats); + S3ADataBlocks.DataBlock block = factory.create("object/key", 1, BLOCK_SIZE, outstats); block.write(dataset, 0, dataset.length); S3ADataBlocks.BlockUploadData uploadData = block.startUpload(); InputStream stream = uploadData.getUploadStream(); diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestDataBlocks.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestDataBlocks.java index 700ef5ced3d8a..97cfff7ff24c7 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestDataBlocks.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestDataBlocks.java @@ -51,7 +51,7 @@ public void testByteBufferIO() throws Throwable { new S3ADataBlocks.ByteBufferBlockFactory(null)) { int limit = 128; S3ADataBlocks.ByteBufferBlockFactory.ByteBufferBlock block - = factory.create(1, limit, null); + = factory.create("object/key", 1, limit, null); assertOutstandingBuffers(factory, 1); byte[] buffer = ContractTestUtils.toAsciiByteArray("test data"); From 2981b6a3d15386e1e1146eb3af91ef3f0010c49d Mon Sep 17 00:00:00 2001 From: Chris Bevard Date: Tue, 18 Apr 2023 12:16:40 -0400 Subject: [PATCH 3/9] included the audit span ID in the s3ablock file name --- .../apache/hadoop/fs/s3a/S3ABlockOutputStream.java | 2 +- .../org/apache/hadoop/fs/s3a/S3ADataBlocks.java | 14 ++++++++------ .../apache/hadoop/fs/s3a/WriteOperationHelper.java | 1 + .../org/apache/hadoop/fs/s3a/WriteOperations.java | 7 +++++++ .../hadoop/fs/s3a/ITestS3ABlockOutputArray.java | 2 +- .../org/apache/hadoop/fs/s3a/TestDataBlocks.java | 2 +- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java index 73da79a30391d..f43a70859197d 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java @@ -232,7 +232,7 @@ private synchronized S3ADataBlocks.DataBlock createBlockIfNeeded() LOG.error("Number of partitions in stream exceeds limit for S3: " + Constants.MAX_MULTIPART_COUNT + " write may fail."); } - activeBlock = blockFactory.create(key, blockCount, this.blockSize, statistics); + activeBlock = blockFactory.create(writeOperationHelper.getAuditSpan().getSpanId(), key, blockCount, this.blockSize, statistics); } return activeBlock; } diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java index 63b0bdd33c488..507065fe36665 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java @@ -175,13 +175,14 @@ protected BlockFactory(S3AFileSystem owner) { /** * Create a block. * - * @param key of s3 object being written to + * @param spanId id of the audit span + * @param key key of s3 object being written to * @param index index of block * @param limit limit of the block. * @param statistics stats to work with * @return a new block. */ - abstract DataBlock create(String key, long index, long limit, + abstract DataBlock create(String spanId, String key, long index, long limit, BlockOutputStreamStatistics statistics) throws IOException; @@ -392,7 +393,7 @@ static class ArrayBlockFactory extends BlockFactory { } @Override - DataBlock create(String key, long index, long limit, + DataBlock create(String spanId, String key, long index, long limit, BlockOutputStreamStatistics statistics) throws IOException { Preconditions.checkArgument(limit > 0, @@ -517,7 +518,7 @@ static class ByteBufferBlockFactory extends BlockFactory { } @Override - ByteBufferBlock create(String key, long index, long limit, + ByteBufferBlock create(String spanId, String key, long index, long limit, BlockOutputStreamStatistics statistics) throws IOException { Preconditions.checkArgument(limit > 0, @@ -809,6 +810,7 @@ static class DiskBlockFactory extends BlockFactory { /** * Create a temp file and a {@link DiskBlock} instance to manage it. * + * @param spanId id of the audit span * @param key of the s3 object being written * @param index block index * @param limit limit of the block. -1 means "no limit" @@ -817,14 +819,14 @@ static class DiskBlockFactory extends BlockFactory { * @throws IOException IO problems */ @Override - DataBlock create(String key, long index, + DataBlock create(String spanId, String key, long index, long limit, BlockOutputStreamStatistics statistics) throws IOException { Preconditions.checkArgument(limit != 0, "Invalid block size: %d [%s]", limit, key); File destFile = getOwner() - .createTmpFileForWrite(String.format("s3ablock-%04d-%s-", index, escapeS3Key(key)), + .createTmpFileForWrite(String.format("s3ablock-%04d-%s-%s-", index, spanId, escapeS3Key(key)), limit, getOwner().getConf()); return new DiskBlock(destFile, limit, index, statistics); } diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperationHelper.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperationHelper.java index 7e0875d8bb960..17c6e89de0ab7 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperationHelper.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperationHelper.java @@ -216,6 +216,7 @@ public T retry(String action, * Get the audit span this object was created with. * @return the audit span */ + @Override public AuditSpan getAuditSpan() { return auditSpan; } diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperations.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperations.java index 9063423122b93..f20d0445640ef 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperations.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/WriteOperations.java @@ -42,6 +42,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathIOException; import org.apache.hadoop.fs.s3a.impl.PutObjectOptions; +import org.apache.hadoop.fs.store.audit.AuditSpan; import org.apache.hadoop.fs.store.audit.AuditSpanSource; import org.apache.hadoop.util.functional.CallableRaisingIOE; @@ -313,6 +314,12 @@ UploadPartResult uploadPart(UploadPartRequest request) */ Configuration getConf(); + /** + * Get the audit span this object was created with. + * @return the audit span + */ + AuditSpan getAuditSpan(); + /** * Create a S3 Select request for the destination path. * This does not build the query. diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java index aeb1da248ea7c..e21e755bbe547 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java @@ -136,7 +136,7 @@ private void markAndResetDatablock(S3ADataBlocks.BlockFactory factory) new S3AInstrumentation(new URI("s3a://example")); BlockOutputStreamStatistics outstats = instrumentation.newOutputStreamStatistics(null); - S3ADataBlocks.DataBlock block = factory.create("object/key", 1, BLOCK_SIZE, outstats); + S3ADataBlocks.DataBlock block = factory.create("spanId", "object/key", 1, BLOCK_SIZE, outstats); block.write(dataset, 0, dataset.length); S3ADataBlocks.BlockUploadData uploadData = block.startUpload(); InputStream stream = uploadData.getUploadStream(); diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestDataBlocks.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestDataBlocks.java index 97cfff7ff24c7..d2ea0218acd9f 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestDataBlocks.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestDataBlocks.java @@ -51,7 +51,7 @@ public void testByteBufferIO() throws Throwable { new S3ADataBlocks.ByteBufferBlockFactory(null)) { int limit = 128; S3ADataBlocks.ByteBufferBlockFactory.ByteBufferBlock block - = factory.create("object/key", 1, limit, null); + = factory.create("spanId", "s3\\object/key", 1, limit, null); assertOutstandingBuffers(factory, 1); byte[] buffer = ContractTestUtils.toAsciiByteArray("test data"); From fc86c3780d8d2bed436d89c14eaaf50086941fba Mon Sep 17 00:00:00 2001 From: Chris Bevard Date: Tue, 18 Apr 2023 14:29:17 -0400 Subject: [PATCH 4/9] updated javadocs and test mock --- .../java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java | 5 +++++ .../org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java index f43a70859197d..ac22c47b06135 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java @@ -725,6 +725,11 @@ public void hsync() throws IOException { /** * Shared processing of Syncable operation reporting/downgrade. + * + * Syncable API is not supported, so calls to hsync/hflush will throw an UnsupportedOperationException unless the + * stream was constructed with {@link #downgradeSyncableExceptions} set to true, in which case the stream is flushed. + * @throws IOException IO Problem + * @throws UnsupportedOperationException if downgrade syncable exceptions is set to false */ private void handleSyncableInvocation() throws IOException { final UnsupportedOperationException ex diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java index 27f49f2c658ef..beeeb39fc4852 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3ABlockOutputStream.java @@ -26,6 +26,7 @@ import org.apache.hadoop.fs.s3a.statistics.impl.EmptyS3AStatisticsContext; import org.apache.hadoop.fs.s3a.test.MinimalWriteOperationHelperCallbacks; import org.apache.hadoop.fs.statistics.IOStatisticsContext; +import org.apache.hadoop.fs.store.audit.AuditSpan; import org.apache.hadoop.util.Progressable; import org.junit.Before; import org.junit.Test; @@ -62,6 +63,9 @@ private S3ABlockOutputStream.BlockOutputStreamBuilder mockS3ABuilder() { mock(S3ADataBlocks.BlockFactory.class); long blockSize = Constants.DEFAULT_MULTIPART_SIZE; WriteOperationHelper oHelper = mock(WriteOperationHelper.class); + AuditSpan auditSpan = mock(AuditSpan.class); + when(auditSpan.getSpanId()).thenReturn("spanId"); + when(oHelper.getAuditSpan()).thenReturn(auditSpan); PutTracker putTracker = mock(PutTracker.class); final S3ABlockOutputStream.BlockOutputStreamBuilder builder = S3ABlockOutputStream.builder() From 568f92c03b9a49816bb539d22fa12d6e912a742d Mon Sep 17 00:00:00 2001 From: Chris Bevard Date: Fri, 21 Apr 2023 12:30:49 -0400 Subject: [PATCH 5/9] added a test for datablock tmp file name length --- .../hadoop/fs/s3a/S3ABlockOutputStream.java | 9 +++-- .../apache/hadoop/fs/s3a/S3ADataBlocks.java | 5 +-- .../fs/s3a/ITestS3ABlockOutputArray.java | 37 +++++++++++++++++++ 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java index ac22c47b06135..b95fc9c6ed92d 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java @@ -232,7 +232,9 @@ private synchronized S3ADataBlocks.DataBlock createBlockIfNeeded() LOG.error("Number of partitions in stream exceeds limit for S3: " + Constants.MAX_MULTIPART_COUNT + " write may fail."); } - activeBlock = blockFactory.create(writeOperationHelper.getAuditSpan().getSpanId(), key, blockCount, this.blockSize, statistics); + activeBlock = blockFactory.create( + writeOperationHelper.getAuditSpan().getSpanId(), + key, blockCount, this.blockSize, statistics); } return activeBlock; } @@ -726,8 +728,9 @@ public void hsync() throws IOException { /** * Shared processing of Syncable operation reporting/downgrade. * - * Syncable API is not supported, so calls to hsync/hflush will throw an UnsupportedOperationException unless the - * stream was constructed with {@link #downgradeSyncableExceptions} set to true, in which case the stream is flushed. + * Syncable API is not supported, so calls to hsync/hflush will throw an + * UnsupportedOperationException unless the stream was constructed with + * {@link #downgradeSyncableExceptions} set to true, in which case the stream is flushed. * @throws IOException IO Problem * @throws UnsupportedOperationException if downgrade syncable exceptions is set to false */ diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java index 507065fe36665..b3c895ad0471f 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ADataBlocks.java @@ -825,9 +825,8 @@ DataBlock create(String spanId, String key, long index, throws IOException { Preconditions.checkArgument(limit != 0, "Invalid block size: %d [%s]", limit, key); - File destFile = getOwner() - .createTmpFileForWrite(String.format("s3ablock-%04d-%s-%s-", index, spanId, escapeS3Key(key)), - limit, getOwner().getConf()); + String prefix = String.format("s3ablock-%04d-%s-%s-", index, spanId, escapeS3Key(key)); + File destFile = getOwner().createTmpFileForWrite(prefix, limit, getOwner().getConf()); return new DiskBlock(destFile, limit, index, statistics); } diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java index e21e755bbe547..4a28fa2d321aa 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java @@ -29,6 +29,7 @@ import org.junit.BeforeClass; import org.junit.Test; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -79,6 +80,42 @@ public void testRegularUpload() throws IOException { verifyUpload("regular", 1024); } + /** + * Test that the DiskBlock's local file doesn't result in error when the S3 key exceeds the max + * char limit of the local file system. Currently + * {@link java.io.File#createTempFile(String, String, File)} is being relied on to handle the + * truncation. + * @throws IOException + */ + @Test + public void testDiskBlockCreate() throws IOException { + S3ADataBlocks.BlockFactory diskBlockFactory = + new S3ADataBlocks.DiskBlockFactory(getFileSystem()); + String s3Key = // 1024 char + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key"; + S3ADataBlocks.DataBlock dataBlock = diskBlockFactory.create("spanId", s3Key, 1, + getFileSystem().getDefaultBlockSize(), null); + LOG.info(dataBlock.toString()); // block file name and location can be viewed in failsafe-report + + // delete the block file + dataBlock.innerClose(); + diskBlockFactory.close(); + } + @Test(expected = IOException.class) public void testWriteAfterStreamClose() throws Throwable { Path dest = path("testWriteAfterStreamClose"); From 5862ff659331d663d03fcde7daa3cf938876aacc Mon Sep 17 00:00:00 2001 From: Chris Bevard Date: Wed, 26 Apr 2023 14:01:03 -0400 Subject: [PATCH 6/9] added check to make sure the tmp file was created --- .../fs/s3a/ITestS3ABlockOutputArray.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java index 4a28fa2d321aa..eb32f117a68ed 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java @@ -33,6 +33,9 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; +import java.nio.file.Files; +import java.util.Arrays; +import java.util.Objects; import static org.apache.hadoop.fs.StreamCapabilities.ABORTABLE_STREAM; import static org.apache.hadoop.fs.s3a.Constants.*; @@ -89,8 +92,6 @@ public void testRegularUpload() throws IOException { */ @Test public void testDiskBlockCreate() throws IOException { - S3ADataBlocks.BlockFactory diskBlockFactory = - new S3ADataBlocks.DiskBlockFactory(getFileSystem()); String s3Key = // 1024 char "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + @@ -107,13 +108,18 @@ public void testDiskBlockCreate() throws IOException { "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + "very_long_s3_key"; - S3ADataBlocks.DataBlock dataBlock = diskBlockFactory.create("spanId", s3Key, 1, - getFileSystem().getDefaultBlockSize(), null); - LOG.info(dataBlock.toString()); // block file name and location can be viewed in failsafe-report - - // delete the block file - dataBlock.innerClose(); - diskBlockFactory.close(); + long blockSize = getFileSystem().getDefaultBlockSize(); + try (S3ADataBlocks.BlockFactory diskBlockFactory = + new S3ADataBlocks.DiskBlockFactory(getFileSystem()); + S3ADataBlocks.DataBlock dataBlock = + diskBlockFactory.create("spanId", s3Key, 1, blockSize, null); + ) { + boolean created = Arrays.stream( + Objects.requireNonNull(new File(getConfiguration().get("hadoop.tmp.dir")).listFiles())) + .anyMatch(f -> f.getName().contains("very_long_s3_key")); + assertTrue(created); + LOG.info(dataBlock.toString()); // block file name/location can be viewed in failsafe-report + } } @Test(expected = IOException.class) From 8bd45e2547620e79a0e42dcb2b0627e27360f67f Mon Sep 17 00:00:00 2001 From: Chris Bevard Date: Thu, 27 Apr 2023 10:01:50 -0400 Subject: [PATCH 7/9] added message to assertion for easier debugging --- .../org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java index eb32f117a68ed..cea432337a523 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java @@ -114,10 +114,11 @@ public void testDiskBlockCreate() throws IOException { S3ADataBlocks.DataBlock dataBlock = diskBlockFactory.create("spanId", s3Key, 1, blockSize, null); ) { + String tmpDir = getConfiguration().get("hadoop.tmp.dir"); boolean created = Arrays.stream( - Objects.requireNonNull(new File(getConfiguration().get("hadoop.tmp.dir")).listFiles())) + Objects.requireNonNull(new File(tmpDir).listFiles())) .anyMatch(f -> f.getName().contains("very_long_s3_key")); - assertTrue(created); + assertTrue(String.format("tmp file should have been created locally in %s", tmpDir), created); LOG.info(dataBlock.toString()); // block file name/location can be viewed in failsafe-report } } From 132db421d7c0553d5387df6d8525d175794eee9c Mon Sep 17 00:00:00 2001 From: Chris Bevard Date: Thu, 4 May 2023 09:06:06 -0400 Subject: [PATCH 8/9] checkstyle corrections --- .../org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java index cea432337a523..82ec36c1aaf4c 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java @@ -33,7 +33,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; -import java.nio.file.Files; import java.util.Arrays; import java.util.Objects; @@ -93,7 +92,7 @@ public void testRegularUpload() throws IOException { @Test public void testDiskBlockCreate() throws IOException { String s3Key = // 1024 char - "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + "very_long_s3_key__very_long_s3_key__very_long_s3_key__very_long_s3_key__" + @@ -112,11 +111,11 @@ public void testDiskBlockCreate() throws IOException { try (S3ADataBlocks.BlockFactory diskBlockFactory = new S3ADataBlocks.DiskBlockFactory(getFileSystem()); S3ADataBlocks.DataBlock dataBlock = - diskBlockFactory.create("spanId", s3Key, 1, blockSize, null); + diskBlockFactory.create("spanId", s3Key, 1, blockSize, null); ) { String tmpDir = getConfiguration().get("hadoop.tmp.dir"); boolean created = Arrays.stream( - Objects.requireNonNull(new File(tmpDir).listFiles())) + Objects.requireNonNull(new File(tmpDir).listFiles())) .anyMatch(f -> f.getName().contains("very_long_s3_key")); assertTrue(String.format("tmp file should have been created locally in %s", tmpDir), created); LOG.info(dataBlock.toString()); // block file name/location can be viewed in failsafe-report From f8d49be71f8400644d91d64e7d4109d09aa407c1 Mon Sep 17 00:00:00 2001 From: Chris Bevard Date: Thu, 4 May 2023 15:19:46 -0400 Subject: [PATCH 9/9] checkstyle again --- .../java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java index 82ec36c1aaf4c..bfeaa25f16ca5 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ABlockOutputArray.java @@ -111,7 +111,7 @@ public void testDiskBlockCreate() throws IOException { try (S3ADataBlocks.BlockFactory diskBlockFactory = new S3ADataBlocks.DiskBlockFactory(getFileSystem()); S3ADataBlocks.DataBlock dataBlock = - diskBlockFactory.create("spanId", s3Key, 1, blockSize, null); + diskBlockFactory.create("spanId", s3Key, 1, blockSize, null); ) { String tmpDir = getConfiguration().get("hadoop.tmp.dir"); boolean created = Arrays.stream(