Skip to content

Commit 3693ff6

Browse files
committed
HADOOP-18889. checkstyles.
the javadoc warning is (a) mistaken (b) complaining about an existing entry Change-Id: Ifbbf486cc58d5f896fa8f4a5a38889351bd8fcbe
1 parent a0ffcb5 commit 3693ff6

File tree

4 files changed

+14
-20
lines changed

4 files changed

+14
-20
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,18 @@
7676
* Because the {@link #shouldRetry(Exception, int, int, boolean)} method
7777
* does this translation if an {@code SdkException} is processed,
7878
* the policy defined for the IOEs also applies to the original exceptions.
79-
*
79+
* <p>
8080
* Put differently: this retry policy aims to work for handlers of the
8181
* untranslated exceptions, as well as the translated ones.
8282
* @see <a href="http://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html">S3 Error responses</a>
83-
* @see <a href="http://docs.aws.amazon.com/AmazonS3/latest/dev/ErrorBestPractices.html">Amazon S3 Error Best Practices</a>
84-
*
83+
* @see <a href="http://docs.aws.amazon.com/AmazonS3/latest/dev/ErrorBestPractices.html"> Amazon S3 Error Best Practices </a>
84+
* <p>
8585
* Note that because delete is considered idempotent, all s3a operations currently
8686
* declare themselves idempotent.
8787
* This means the retry policy here is more complex than it needs to be -but it
8888
* does force us to consider when retrying operations would not be safe.
8989
*/
90-
@SuppressWarnings("visibilitymodifier") // I want a struct of finals, for real.
90+
@SuppressWarnings("visibilitymodifier") // we want a struct of finals, for real.
9191
public class S3ARetryPolicy implements RetryPolicy {
9292

9393
private static final Logger LOG = LoggerFactory.getLogger(

hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/assumed_roles.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,6 @@ Instantiate org.apache.hadoop.fs.s3a.auth.AssumedRoleCredentialProvider on :
499499
MalformedPolicyDocument: Syntax errors in policy.
500500
(Service: AWSSecurityTokenService; Status Code: 400; Error Code: MalformedPolicyDocument;
501501
Request ID: 24a281e8-f553-11e7-aa91-a96becfb4d45)
502-
503502
```
504503

505504
### <a name="recursive_auth"></a> `IOException`: "AssumedRoleCredentialProvider cannot be in fs.s3a.assumed.role.credentials.provider"
@@ -591,7 +590,6 @@ the permission for the S3 Operation invoked during the call.
591590
java.nio.file.AccessDeniedException: a: Writing Object on a:
592591
software.amazon.awssdk.services.s3.model.S3Exception: Access Denied
593592
(Service: S3, Status Code: 403, Request ID: F08EV50F85AYKF1V, Extended Request ID: 75vMz9xWNP5/lYplPSZfm/i4yQ5q0G32SIwOwfaj6a8gNCRj9tLBAqcLaaexT/aNg2DhWZQPvDU=):AccessDenied
594-
595593
```
596594

597595
This is the policy restriction behaving as intended: the caller is trying to
@@ -626,7 +624,7 @@ If the client does have write access to the bucket, verify that the caller has
626624

627625
```
628626
java.nio.file.AccessDeniedException: test/testDTFileSystemClient: Writing Object on test/testDTFileSystemClient:
629-
software.amazon.awssdk.services.s3.model.S3Exception: Access Denied (Service: Amazon S3; Status Code: 403;
627+
software.amazon.awssdk.services.s3.model.S3Exception: Access Denied (Service: Amazon S3; Status Code: 403;
630628
Error Code: AccessDenied; Request ID: E86544FF1D029857)
631629
632630
```

hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/third_party_stores.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ this makes renaming and deleting significantly slower.
341341
<name>fs.s3a.bucket.gcs-container.access.key</name>
342342
<value>GOOG1EZ....</value>
343343
</property>
344-
344+
345345
<property>
346346
<name>fs.s3a.bucket.gcs-container.secret.key</name>
347347
<value>SECRETS</value>
@@ -408,7 +408,6 @@ It is also a way to regression test foundational S3A third-party store compatibi
408408
<name>test.fs.s3a.content.encoding.enabled</name>
409409
<value>false</value>
410410
</property>
411-
412411
</configuration>
413412
```
414413

hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/troubleshooting_s3a.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ Fix: add it to classpath.
104104
Maven/Ivy/SBT/Gradle builds which import `hadoop-aws` or
105105
`hadoop-cloud-storage` artifacts should get the artifact automatically.
106106

107-
However, it may
108-
109-
110107
### `ClassNotFoundException: com.amazonaws.auth.AWSCredentials`
111108

112109
(or other `com.amazonaws` class.)
@@ -434,7 +431,7 @@ directory will _only_ be in the destination. And files for which the rename oper
434431
had yet to commence -they will only be in the source tree.
435432

436433
The user has to recover from this themselves. Be assured: no data will have been deleted, it
437-
is just that the data may now be scattered across two directories.
434+
is just that the data may now be scattered across two directories.
438435
Note: this is one reason why any application which tries to atomically commit work
439436
via rename (classic Hadoop output committers, distcp with the `-atomic` option) are
440437
not safe to use with S3. It is not a file system.
@@ -927,7 +924,6 @@ Possible causes:
927924
* the KMS key referenced by the ARN is in a different region than the S3 bucket
928925
being used.
929926

930-
931927
### Using SSE-C "Bad Request"
932928

933929
When performing file operations the user may run into an unexpected 400/403
@@ -1072,8 +1068,8 @@ If the value in `fs.s3a.encryption.key` property, does not exist
10721068

10731069
```
10741070
Caused by: software.amazon.awssdk.services.kms.model.NotFoundException: Invalid keyId abc
1075-
(Service: AWSKMS; Status Code: 400; Error Code: NotFoundException; Request ID: 9d53552a-3d1b-47c8-984c-9a599d5c2391; Proxy: null)
1076-
1071+
(Service: AWSKMS; Status Code: 400; Error Code: NotFoundException; Request ID:
1072+
9d53552a-3d1b-47c8-984c-9a599d5c2391; Proxy: null)
10771073
```
10781074

10791075
Check if `fs.s3a.encryption.key` is set correctly and matches the
@@ -1084,9 +1080,10 @@ same on AWS console.
10841080
User doesn't have authorization to the specific AWS KMS Key ID.
10851081
```
10861082
Caused by: software.amazon.awssdk.services.kms.model.KmsException:
1087-
User: arn:aws:iam::152813717728:user/<user> is not authorized to perform: kms:GenerateDataKey on resource: <key_ID>
1088-
(Service: AWSKMS; Status Code: 400; Error Code: AccessDeniedException; Request ID: 4ded9f1f-b245-4213-87fc-16cba7a1c4b9; Proxy: null)
1089-
1083+
User: arn:aws:iam::152813717728:user/<user> is not authorized to perform:
1084+
kms:GenerateDataKey on resource: <key_ID>
1085+
(Service: AWSKMS; Status Code: 400; Error Code: AccessDeniedException;
1086+
Request ID: 4ded9f1f-b245-4213-87fc-16cba7a1c4b9; Proxy: null)
10901087
```
10911088

10921089
The user trying to use the KMS Key ID should have the right permissions to access
@@ -1490,7 +1487,7 @@ The number of retries and interval between each retry can be configured:
14901487
```
14911488

14921489
Not all failures are retried *in the S3A Code* -though some may be retried within the
1493-
AWS SDK.
1490+
AWS SDK.
14941491
Specifically excluded are those considered unrecoverable:
14951492

14961493
* Low-level networking: `UnknownHostException`, `NoRouteToHostException`.

0 commit comments

Comments
 (0)