HADOOP-17192. ITestS3AHugeFilesSSECDiskBlock failing (#2221)
Contributed by Mukund Thakur
This commit is contained in:
parent
e592ec5f8b
commit
4a400d3193
|
@ -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());
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue