Skip to content

Commit 40f1a6a

Browse files
author
Mehakmeet Singh
committed
HADOOP-17817. review comments
1 parent eec1937 commit 40f1a6a

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,8 @@ public void initialize(URI name, Configuration originalConf)
540540
LOG.debug("Using metadata store {}, authoritative store={}, authoritative path={}",
541541
getMetadataStore(), allowAuthoritativeMetadataStore, allowAuthoritativePaths);
542542
if (isCSEEnabled) {
543-
throw new RuntimeException("Disable S3-CSE if S3Guard is enabled.");
543+
throw new PathIOException(uri.toString(), "S3-CSE cannot be used "
544+
+ "with S3Guard");
544545
}
545546
}
546547

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,11 +1435,11 @@ The user trying to use the KMS Key ID should have the right permissions to acces
14351435
If not, then add permission(or IAM role) in "Key users" section by selecting the
14361436
AWS-KMS CMK Key on AWS console.
14371437

1438-
### Disable S3-CSE if S3Guard is enabled
1438+
### S3-CSE cannot be used with S3Guard
14391439

14401440
S3-CSE not supported for S3Guard enabled buckets.
14411441
```
1442-
java.lang.RuntimeException: Disable S3-CSE if S3Guard is enabled.
1442+
org.apache.hadoop.fs.PathIOException: `s3a://test-bucket': S3-CSE cannot be used with S3Guard
14431443
at org.apache.hadoop.fs.s3a.S3AFileSystem.initialize(S3AFileSystem.java:543)
14441444
at org.apache.hadoop.fs.FileSystem.createFileSystem(FileSystem.java:3460)
14451445
at org.apache.hadoop.fs.FileSystem.access$300(FileSystem.java:172)

0 commit comments

Comments
 (0)