Skip to content

Commit 906747e

Browse files
committed
Cleanup comments&imports
1 parent 5a09dd4 commit 906747e

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Invoker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public static void once(String action, String path,
170170

171171
/**
172172
*
173-
* Wait for a future, translating AmazonClientException into an IOException.
173+
* Wait for a future, translating SdkException into an IOException.
174174
* @param action action to execute (used in error messages)
175175
* @param path path of work (used in error messages)
176176
* @param future future to await for

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2171,7 +2171,7 @@ private Pair<S3AFileStatus, S3AFileStatus> initiateRename(
21712171
* This operation throws an exception on any failure which needs to be
21722172
* reported and downgraded to a failure.
21732173
* Retries: retry translated, assuming all operations it is called do
2174-
* so. For safely, consider catch and handle AmazonClientException
2174+
* so. For safely, consider catch and handle SdkException
21752175
* because this is such a complex method there's a risk it could surface.
21762176
* @param source path to be renamed
21772177
* @param dest new path after rename
@@ -3840,7 +3840,7 @@ private boolean s3Exists(final Path path, final Set<StatusProbeEnum> probes)
38403840
* @throws IOException IO problem
38413841
* @throws FileAlreadyExistsException the destination file exists and
38423842
* overwrite==false
3843-
* @throws AmazonClientException failure in the AWS SDK
3843+
* @throws SdkException failure in the AWS SDK
38443844
*/
38453845
@Override
38463846
@AuditEntryPoint
@@ -4331,7 +4331,7 @@ private CopyObjectResponse copyFile(String srcKey, String dstKey, long size,
43314331
* Retry policy: none + untranslated.
43324332
* @param request request to initiate
43334333
* @return the result of the call
4334-
* @throws AmazonClientException on failures inside the AWS SDK
4334+
* @throws SdkException on failures inside the AWS SDK
43354335
* @throws IOException Other IO problems
43364336
*/
43374337
@Retries.OnceRaw
@@ -5042,7 +5042,7 @@ public MultipartUtils.UploadIterator listUploads(@Nullable String prefix)
50425042
* Retry policy: retry, translated.
50435043
* @return a listing of multipart uploads.
50445044
* @param prefix prefix to scan for, "" for none
5045-
* @throws IOException IO failure, including any uprated AmazonClientException
5045+
* @throws IOException IO failure, including any uprated SdkException
50465046
*/
50475047
@InterfaceAudience.Private
50485048
@Retries.RetryTranslated

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ARetryPolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
* particularly those extracted from
7171
* {@link S3AUtils#translateException(String, Path, SdkException)}.
7272
* Because the {@link #shouldRetry(Exception, int, int, boolean)} method
73-
* does this translation if an {@code AmazonClientException} is processed,
73+
* does this translation if an {@code SdkException} is processed,
7474
* the policy defined for the IOEs also applies to the original exceptions.
7575
*
7676
* Put differently: this retry policy aims to work for handlers of the

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/NoAuthWithAWSException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.apache.hadoop.fs.s3a.CredentialInitializationException;
2222

2323
/**
24-
* A specific subclass of {@code AmazonClientException} which is
24+
* A specific subclass of {@code SdkException} which is
2525
* used in the S3A retry policy to fail fast when there is any
2626
* authentication problem.
2727
*/

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/ITestRenameDeleteRace.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
import java.util.concurrent.Semaphore;
2424
import java.util.concurrent.TimeUnit;
2525

26-
import com.amazonaws.AmazonClientException;
27-
2826
import org.assertj.core.api.Assertions;
2927
import org.junit.Test;
3028
import org.slf4j.Logger;
3129
import org.slf4j.LoggerFactory;
3230

31+
import software.amazon.awssdk.core.exception.SdkException;
32+
3333
import org.apache.hadoop.conf.Configuration;
3434
import org.apache.hadoop.fs.Path;
3535
import org.apache.hadoop.fs.contract.ContractTestUtils;
@@ -207,7 +207,7 @@ private BlockingFakeDirMarkerFS() {
207207

208208
@Override
209209
protected void maybeCreateFakeParentDirectory(final Path path)
210-
throws IOException, AmazonClientException {
210+
throws IOException, SdkException {
211211
LOG.info("waking anything blocked on the signal semaphore");
212212
// notify anything waiting
213213
signalCreatingFakeParentDirectory.release();

0 commit comments

Comments
 (0)