Skip to content

Fix flaky test in RetryableS3OutputStreamTest #16639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kfaraz merged 5 commits into from
Jun 24, 2024
Merged

Fix flaky test in RetryableS3OutputStreamTest #16639

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee4ff06
Fix flaky test in RetryableS3OutputStreamTest
Akshat-Jain Jun 22, 2024
1695588
Address CodeQL
Akshat-Jain Jun 22, 2024
8780efb
Simplify assertion logic
Akshat-Jain Jun 22, 2024
bee45c0
Change comment
Akshat-Jain Jun 22, 2024
123f279
Address review comments
Akshat-Jain Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 34 additions & 35 deletions ...ensions/src/test/java/org/apache/druid/storage/s3/output/RetryableS3OutputStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,8 @@ public void testWriteAndHappy() throws IOException
{
chunkSize = 10;
ByteBuffer bb = ByteBuffer.allocate(Integer.BYTES);
try (RetryableS3OutputStream out = new RetryableS3OutputStream(
config,
s3,
path,
s3UploadManager
)) {
try (RetryableS3OutputStream out =
new RetryableS3OutputStream(config, s3, path, s3UploadManager)) {
for (int i = 0; i < 25; i++) {
bb.clear();
bb.putInt(i);
Expand All @@ -135,12 +131,8 @@ public void testWriteSizeLargerThanConfiguredMaxChunkSizeShouldSucceed() throws
{
chunkSize = 10;
ByteBuffer bb = ByteBuffer.allocate(Integer.BYTES * 3);
try (RetryableS3OutputStream out = new RetryableS3OutputStream(
config,
s3,
path,
s3UploadManager
)) {
try (RetryableS3OutputStream out =
new RetryableS3OutputStream(config, s3, path, s3UploadManager)) {
bb.clear();
bb.putInt(1);
bb.putInt(2);
Expand All @@ -156,12 +148,8 @@ public void testWriteSizeLargerThanConfiguredMaxChunkSizeShouldSucceed() throws
public void testWriteSmallBufferShouldSucceed() throws IOException
{
chunkSize = 128;
try (RetryableS3OutputStream out = new RetryableS3OutputStream(
config,
s3,
path,
s3UploadManager
)) {
try (RetryableS3OutputStream out =
new RetryableS3OutputStream(config, s3, path, s3UploadManager)) {
for (int i = 0; i < 600; i++) {
out.write(i);
}
Expand All @@ -171,19 +159,31 @@ public void testWriteSmallBufferShouldSucceed() throws IOException
s3.assertCompleted(chunkSize, 600);
}

@Test
public void testWriteSmallBufferExactChunkSizeShouldSucceed() throws IOException
{
chunkSize = 128;
final int fileSize = 128 * 5;
try (RetryableS3OutputStream out =
new RetryableS3OutputStream(config, s3, path, s3UploadManager)) {
for (int i = 0; i < fileSize; i++) {
out.write(i);
}
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed
}
// each chunk 128 bytes, so there should be 5 chunks.
Assert.assertEquals(5, s3.partRequests.size());
s3.assertCompleted(chunkSize, fileSize);
}

@Test
public void testSuccessToUploadAfterRetry() throws IOException
{
final TestAmazonS3 s3 = new TestAmazonS3(1);

chunkSize = 10;
ByteBuffer bb = ByteBuffer.allocate(Integer.BYTES);
try (RetryableS3OutputStream out = new RetryableS3OutputStream(
config,
s3,
path,
s3UploadManager
)) {
try (RetryableS3OutputStream out =
new RetryableS3OutputStream(config, s3, path, s3UploadManager)) {
for (int i = 0; i < 25; i++) {
bb.clear();
bb.putInt(i);
Expand All @@ -201,12 +201,8 @@ public void testFailToUploadAfterRetries() throws IOException
final TestAmazonS3 s3 = new TestAmazonS3(3);

ByteBuffer bb = ByteBuffer.allocate(Integer.BYTES);
try (RetryableS3OutputStream out = new RetryableS3OutputStream(
config,
s3,
path,
s3UploadManager
)) {
try (RetryableS3OutputStream out =
new RetryableS3OutputStream(config, s3, path, s3UploadManager)) {
for (int i = 0; i < 2; i++) {
bb.clear();
bb.putInt(i);
Expand Down Expand Up @@ -284,13 +280,16 @@ private void assertCompleted(long chunkSize, long expectedFileSize)
Set<Integer> partNumbersFromRequest = partRequests.stream().map(UploadPartRequest::getPartNumber).collect(Collectors.toSet());
Assert.assertEquals(partRequests.size(), partNumbersFromRequest.size());

for (int i = 0; i < partRequests.size(); i++) {
if (i < partRequests.size() - 1) {
Assert.assertEquals(chunkSize, partRequests.get(i).getPartSize());
} else {
Assert.assertTrue(chunkSize >= partRequests.get(i).getPartSize());
// Verify sizes of uploaded chunks
int numSmallerChunks = 0;
for (UploadPartRequest part : partRequests) {
Assert.assertTrue(part.getPartSize() <= chunkSize);
if (part.getPartSize() < chunkSize) {
++numSmallerChunks;
}
}
Assert.assertTrue(numSmallerChunks <= 1);

final List<PartETag> eTags = completeRequest.getPartETags();
Assert.assertEquals(partRequests.size(), eTags.size());
Assert.assertEquals(
Expand Down