-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update S3 retry logic to account for the underlying cause in case of …
…`IOException` (#15238) * Update S3 retry logic based on the underlying cause in case of IOException. 4xx and other errors wrapped in IOException for instance aren't retriable. * Fix CI
- Loading branch information
1 parent
65b69cd
commit 63e3e95
Showing
3 changed files
with
175 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3UtilsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,111 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.apache.druid.storage.s3; | ||
|
||
import com.amazonaws.services.s3.model.AmazonS3Exception; | ||
import org.junit.Assert; | ||
import org.junit.Test; | ||
|
||
import java.io.IOException; | ||
import java.util.concurrent.atomic.AtomicInteger; | ||
|
||
public class S3UtilsTest | ||
{ | ||
@Test | ||
public void testRetryWithIOExceptions() | ||
{ | ||
final int maxRetries = 3; | ||
final AtomicInteger count = new AtomicInteger(); | ||
Assert.assertThrows( | ||
IOException.class, | ||
() -> S3Utils.retryS3Operation( | ||
() -> { | ||
count.incrementAndGet(); | ||
throw new IOException("hmm"); | ||
}, | ||
maxRetries | ||
)); | ||
Assert.assertEquals(maxRetries, count.get()); | ||
} | ||
|
||
@Test | ||
public void testRetryWith4XXErrors() | ||
{ | ||
final AtomicInteger count = new AtomicInteger(); | ||
Assert.assertThrows( | ||
IOException.class, | ||
() -> S3Utils.retryS3Operation( | ||
() -> { | ||
if (count.incrementAndGet() >= 2) { | ||
return "hey"; | ||
} else { | ||
AmazonS3Exception s3Exception = new AmazonS3Exception("a 403 s3 exception"); | ||
s3Exception.setStatusCode(403); | ||
throw new IOException(s3Exception); | ||
} | ||
}, | ||
3 | ||
)); | ||
Assert.assertEquals(1, count.get()); | ||
} | ||
|
||
@Test | ||
public void testRetryWith5XXErrorsNotExceedingMaxRetries() throws Exception | ||
{ | ||
final int maxRetries = 3; | ||
final AtomicInteger count = new AtomicInteger(); | ||
S3Utils.retryS3Operation( | ||
() -> { | ||
if (count.incrementAndGet() >= maxRetries) { | ||
return "hey"; | ||
} else { | ||
AmazonS3Exception s3Exception = new AmazonS3Exception("a 5xx s3 exception"); | ||
s3Exception.setStatusCode(500); | ||
throw new IOException(s3Exception); | ||
} | ||
}, | ||
maxRetries | ||
); | ||
Assert.assertEquals(maxRetries, count.get()); | ||
} | ||
|
||
@Test | ||
public void testRetryWith5XXErrorsExceedingMaxRetries() | ||
{ | ||
final int maxRetries = 3; | ||
final AtomicInteger count = new AtomicInteger(); | ||
Assert.assertThrows( | ||
IOException.class, | ||
() -> S3Utils.retryS3Operation( | ||
() -> { | ||
if (count.incrementAndGet() > maxRetries) { | ||
return "hey"; | ||
} else { | ||
AmazonS3Exception s3Exception = new AmazonS3Exception("a 5xx s3 exception"); | ||
s3Exception.setStatusCode(500); | ||
throw new IOException(s3Exception); | ||
} | ||
}, | ||
maxRetries | ||
) | ||
); | ||
Assert.assertEquals(maxRetries, count.get()); | ||
} | ||
} |