From e8b8e57e8fcae2d55299557b3d663be0cdad62e3 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Thu, 8 Aug 2024 12:55:11 -0700 Subject: [PATCH 1/2] HADOOP-19072 Override fs.s3a.performance.flags for ITestS3AContractMkdir (ADDENDUM) --- .../apache/hadoop/fs/contract/s3a/ITestS3AContractMkdir.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractMkdir.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractMkdir.java index bace0a79f2458..3fc1bc7b0a746 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractMkdir.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractMkdir.java @@ -23,6 +23,7 @@ import org.apache.hadoop.fs.contract.AbstractFSContract; import static org.apache.hadoop.fs.s3a.Constants.FS_S3A_CREATE_PERFORMANCE; +import static org.apache.hadoop.fs.s3a.Constants.FS_S3A_PERFORMANCE_FLAGS; import static org.apache.hadoop.fs.s3a.S3ATestUtils.removeBaseAndBucketOverrides; /** @@ -35,6 +36,9 @@ protected Configuration createConfiguration() { Configuration conf = super.createConfiguration(); removeBaseAndBucketOverrides(conf, FS_S3A_CREATE_PERFORMANCE); + removeBaseAndBucketOverrides(conf, + FS_S3A_PERFORMANCE_FLAGS); + conf.set(FS_S3A_PERFORMANCE_FLAGS, ""); return conf; } From 47f4f8522b356ca2909d2f1ae0c318e3eb7650a9 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Thu, 8 Aug 2024 22:16:47 -0700 Subject: [PATCH 2/2] changes to ITestS3AFileContextCreateMkdir --- .../hadoop/fs/contract/s3a/ITestS3AContractMkdir.java | 6 +++--- .../fs/s3a/fileContext/ITestS3AFileContextCreateMkdir.java | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractMkdir.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractMkdir.java index 3fc1bc7b0a746..bce67ed67f31d 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractMkdir.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractMkdir.java @@ -34,9 +34,9 @@ public class ITestS3AContractMkdir extends AbstractContractMkdirTest { @Override protected Configuration createConfiguration() { Configuration conf = super.createConfiguration(); - removeBaseAndBucketOverrides(conf, - FS_S3A_CREATE_PERFORMANCE); - removeBaseAndBucketOverrides(conf, + removeBaseAndBucketOverrides( + conf, + FS_S3A_CREATE_PERFORMANCE, FS_S3A_PERFORMANCE_FLAGS); conf.set(FS_S3A_PERFORMANCE_FLAGS, ""); return conf; diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/fileContext/ITestS3AFileContextCreateMkdir.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/fileContext/ITestS3AFileContextCreateMkdir.java index e71ca2ae52ca0..ce7e9d4a43d80 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/fileContext/ITestS3AFileContextCreateMkdir.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/fileContext/ITestS3AFileContextCreateMkdir.java @@ -19,6 +19,7 @@ import org.junit.Before; import static org.apache.hadoop.fs.s3a.Constants.FS_S3A_CREATE_PERFORMANCE; +import static org.apache.hadoop.fs.s3a.Constants.FS_S3A_PERFORMANCE_FLAGS; import static org.apache.hadoop.fs.s3a.S3ATestUtils.removeBaseAndBucketOverrides; /** @@ -32,7 +33,8 @@ public void setUp() throws Exception { Configuration conf = new Configuration(); removeBaseAndBucketOverrides( conf, - FS_S3A_CREATE_PERFORMANCE); + FS_S3A_CREATE_PERFORMANCE, + FS_S3A_PERFORMANCE_FLAGS); fc = S3ATestUtils.createTestFileContext(conf); super.setUp(); }