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 571737f HADOOP-17192. ITestS3AHugeFilesSSECDiskBlock failing (#2221)
571737f is described below
commit 571737f4ac8a2e8a2df664d85655a1e642f1a932
Author: Mukund Thakur <[email protected]>
AuthorDate: Thu Aug 13 18:51:49 2020 +0530
HADOOP-17192. ITestS3AHugeFilesSSECDiskBlock failing (#2221)
Contributed by Mukund Thakur
---
.../apache/hadoop/fs/s3a/scale/ITestS3AHugeFilesSSECDiskBlocks.java | 5 +++++
.../test/java/org/apache/hadoop/fs/s3a/scale/S3AScaleTestBase.java | 4 +---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/ITestS3AHugeFilesSSECDiskBlocks.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/ITestS3AHugeFilesSSECDiskBlocks.java
index 2e5185b..a8635ea 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/ITestS3AHugeFilesSSECDiskBlocks.java
+++
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/ITestS3AHugeFilesSSECDiskBlocks.java
@@ -23,6 +23,9 @@ import org.apache.hadoop.fs.s3a.Constants;
import org.apache.hadoop.fs.s3a.S3AEncryptionMethods;
import org.apache.hadoop.fs.s3a.S3ATestUtils;
+import static
org.apache.hadoop.fs.s3a.Constants.SERVER_SIDE_ENCRYPTION_ALGORITHM;
+import static org.apache.hadoop.fs.s3a.Constants.SERVER_SIDE_ENCRYPTION_KEY;
+import static
org.apache.hadoop.fs.s3a.S3ATestUtils.removeBaseAndBucketOverrides;
import static
org.apache.hadoop.fs.s3a.S3ATestUtils.skipIfEncryptionTestsDisabled;
/**
@@ -45,6 +48,8 @@ public class ITestS3AHugeFilesSSECDiskBlocks
@Override
protected Configuration createScaleConfiguration() {
Configuration conf = super.createScaleConfiguration();
+ removeBaseAndBucketOverrides(conf, SERVER_SIDE_ENCRYPTION_KEY,
+ SERVER_SIDE_ENCRYPTION_ALGORITHM);
S3ATestUtils.disableFilesystemCaching(conf);
conf.set(Constants.SERVER_SIDE_ENCRYPTION_ALGORITHM,
getSSEAlgorithm().getMethod());
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/S3AScaleTestBase.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/S3AScaleTestBase.java
index eb80bc5..42b73d3 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/S3AScaleTestBase.java
+++
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/S3AScaleTestBase.java
@@ -105,9 +105,7 @@ public class S3AScaleTestBase extends AbstractS3ATestBase {
* @return the configuration.
*/
private synchronized Configuration demandCreateConfiguration() {
- if (conf == null) {
- conf = createScaleConfiguration();
- }
+ conf = createScaleConfiguration();
return conf;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
