You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2022/10/19 15:02:47 UTC
[hadoop] branch branch-3.3 updated: HADOOP-18465. Fix S3A SSE test skip when encryption is disabled (#4925)
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 2778bc8d906 HADOOP-18465. Fix S3A SSE test skip when encryption is disabled (#4925)
2778bc8d906 is described below
commit 2778bc8d9068413de2ff3c2bb3644916212121a4
Author: Daniel Carl Jones <dj...@amazon.com>
AuthorDate: Wed Oct 19 16:02:36 2022 +0100
HADOOP-18465. Fix S3A SSE test skip when encryption is disabled (#4925)
Contributed by Daniel Carl Jones
---
.../org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java
index d5778060020..828eb5127cb 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java
@@ -78,8 +78,16 @@ public abstract class AbstractTestS3AEncryption extends AbstractS3ATestBase {
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() {
- skipIfEncryptionTestsDisabled(getFileSystem().getConf());
+ skipIfEncryptionTestsDisabled(createConfiguration());
}
/**
@@ -91,8 +99,8 @@ public abstract class AbstractTestS3AEncryption extends AbstractS3ATestBase {
@Override
public void setup() throws Exception {
try {
- super.setup();
requireEncryptedFileSystem();
+ super.setup();
} catch (AccessDeniedException e) {
skip("Bucket does not allow " + getSSEAlgorithm() + " encryption method");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org