big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-18465. Fix S3A SSE test skip when encryption is disabled (#4925)

Browse Source 
Contributed by Daniel Carl Jones
This commit is contained in:
Daniel Carl Jones 2022-10-06 12:42:01 +01:00 committed by GitHub
parent 1675a28e5a
commit 7ec762a5fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java
View File

@ -78,8 +78,16 @@ protected void patchConfigurationEncryptionSettings(
0, 1, 2, 3, 4, 5, 254, 255, 256, 257, 2 ^ 12 - 1 0, 1, 2, 3, 4, 5, 254, 255, 256, 257, 2 ^ 12 - 1
}; };
/**
* Skips the tests if encryption is not enabled in configuration.
*
* @implNote We can use {@link #createConfiguration()} here since
* it does not depend on any per-bucket based configuration.
* Otherwise, we would need to grab the configuration from an
* instance of {@link S3AFileSystem}.
*/
protected void requireEncryptedFileSystem() { protected void requireEncryptedFileSystem() {
skipIfEncryptionTestsDisabled(getFileSystem().getConf()); skipIfEncryptionTestsDisabled(createConfiguration());
} }
/** /**
@ -91,8 +99,8 @@ protected void requireEncryptedFileSystem() {
@Override @Override
public void setup() throws Exception { public void setup() throws Exception {
try { try {
super.setup();
requireEncryptedFileSystem(); requireEncryptedFileSystem();
super.setup();
} catch (AccessDeniedException e) { } catch (AccessDeniedException e) {
skip("Bucket does not allow " + getSSEAlgorithm() + " encryption method"); skip("Bucket does not allow " + getSSEAlgorithm() + " encryption method");
} }