From c9cd582d6b16335cf74a099ea7dc03c14abb484f Mon Sep 17 00:00:00 2001 From: Mukund Thakur Date: Tue, 11 Aug 2020 12:54:25 +0530 Subject: [PATCH 1/2] HADOOP-17192 Fixing ITestS3AHugeFilesSSECDiskBlock Disabling caching of configuration object in test. --- .../hadoop/fs/s3a/scale/ITestS3AHugeFilesSSECDiskBlocks.java | 5 +++++ .../org/apache/hadoop/fs/s3a/scale/S3AScaleTestBase.java | 5 +---- 2 files changed, 6 insertions(+), 4 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 2e5185bf55d9d5..a8635ea3cd7921 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.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 void setup() throws Exception { @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 eb80bc579f6c1c..e4d055fdbdd45d 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,10 +105,7 @@ public void setup() throws Exception { * @return the configuration. */ private synchronized Configuration demandCreateConfiguration() { - if (conf == null) { - conf = createScaleConfiguration(); - } - return conf; + return conf = createScaleConfiguration(); } /** From 1cb97dcb8e63fd222130e608e9c519eeed169f5d Mon Sep 17 00:00:00 2001 From: Mukund Thakur Date: Thu, 13 Aug 2020 18:04:51 +0530 Subject: [PATCH 2/2] HADOOP-17192 Fixing checkstyle --- .../java/org/apache/hadoop/fs/s3a/scale/S3AScaleTestBase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e4d055fdbdd45d..42b73d3d88c097 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,7 +105,8 @@ public void setup() throws Exception { * @return the configuration. */ private synchronized Configuration demandCreateConfiguration() { - return conf = createScaleConfiguration(); + conf = createScaleConfiguration(); + return conf; } /**