Skip to content

Commit 928b510

Browse files
committed
HADOOP-19559. S3A: Updates S3A default stream to AAL. (#8095)
1 parent cc50dee commit 928b510

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/impl/streams/StreamIntegration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public final class StreamIntegration {
7777
/**
7878
* What is the default type?
7979
*/
80-
public static final InputStreamType DEFAULT_STREAM_TYPE = InputStreamType.Classic;
80+
public static final InputStreamType DEFAULT_STREAM_TYPE = InputStreamType.Analytics;
8181

8282
/**
8383
* Configuration deprecation log for warning about use of the

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AIOStatisticsContext.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
import static org.apache.hadoop.fs.contract.ContractTestUtils.assertCapabilities;
4343
import static org.apache.hadoop.fs.contract.ContractTestUtils.dataset;
4444
import static org.apache.hadoop.fs.contract.ContractTestUtils.writeDataset;
45+
import static org.apache.hadoop.fs.s3a.Constants.INPUT_STREAM_TYPE;
4546
import static org.apache.hadoop.fs.s3a.S3ATestUtils.disablePrefetching;
47+
import static org.apache.hadoop.fs.s3a.impl.streams.InputStreamType.Classic;
4648
import static org.apache.hadoop.fs.statistics.IOStatisticAssertions.assertThatStatisticCounter;
4749
import static org.apache.hadoop.fs.statistics.IOStatisticAssertions.verifyStatisticCounterValue;
4850
import static org.apache.hadoop.fs.statistics.StreamStatisticNames.STREAM_READ_BYTES;
@@ -69,6 +71,7 @@ public class ITestS3AIOStatisticsContext extends AbstractS3ATestBase {
6971
protected Configuration createConfiguration() {
7072
Configuration configuration = super.createConfiguration();
7173
disablePrefetching(configuration);
74+
configuration.setEnum(INPUT_STREAM_TYPE, Classic);
7275
enableIOStatisticsContext();
7376
return configuration;
7477
}

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/performance/ITestUnbufferDraining.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import static org.apache.hadoop.fs.s3a.Constants.CHECKSUM_VALIDATION;
4747
import static org.apache.hadoop.fs.s3a.Constants.ESTABLISH_TIMEOUT;
4848
import static org.apache.hadoop.fs.s3a.Constants.INPUT_FADVISE;
49+
import static org.apache.hadoop.fs.s3a.Constants.INPUT_STREAM_TYPE;
4950
import static org.apache.hadoop.fs.s3a.Constants.MAXIMUM_CONNECTIONS;
5051
import static org.apache.hadoop.fs.s3a.Constants.MAX_ERROR_RETRIES;
5152
import static org.apache.hadoop.fs.s3a.Constants.READAHEAD_RANGE;
@@ -55,6 +56,7 @@
5556
import static org.apache.hadoop.fs.s3a.S3ATestUtils.disablePrefetching;
5657
import static org.apache.hadoop.fs.s3a.S3ATestUtils.removeBaseAndBucketOverrides;
5758
import static org.apache.hadoop.fs.s3a.impl.ConfigurationHelper.setDurationAsSeconds;
59+
import static org.apache.hadoop.fs.s3a.impl.streams.InputStreamType.Classic;
5860
import static org.apache.hadoop.fs.statistics.IOStatisticAssertions.verifyStatisticCounterValue;
5961
import static org.apache.hadoop.fs.statistics.IOStatisticsSupport.retrieveIOStatistics;
6062
import static org.apache.hadoop.fs.statistics.StreamStatisticNames.STREAM_READ_ABORTED;
@@ -106,6 +108,7 @@ public ITestUnbufferDraining() {
106108
@Override
107109
public Configuration createConfiguration() {
108110
Configuration conf = disablePrefetching(super.createConfiguration());
111+
conf.setEnum(INPUT_STREAM_TYPE, Classic);
109112
removeBaseAndBucketOverrides(conf,
110113
ASYNC_DRAIN_THRESHOLD,
111114
CHECKSUM_VALIDATION,

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/ITestS3AInputStreamPerformance.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import static org.apache.hadoop.fs.s3a.S3ATestUtils.disablePrefetching;
6262
import static org.apache.hadoop.fs.s3a.S3ATestUtils.getInputStreamStatistics;
6363
import static org.apache.hadoop.fs.s3a.S3ATestUtils.getS3AInputStream;
64+
import static org.apache.hadoop.fs.s3a.impl.streams.InputStreamType.Classic;
6465
import static org.apache.hadoop.fs.s3a.test.PublicDatasetTestUtils.isUsingDefaultExternalDataFile;
6566
import static org.apache.hadoop.fs.statistics.IOStatisticAssertions.assertThatStatisticMinimum;
6667
import static org.apache.hadoop.fs.statistics.IOStatisticAssertions.lookupMaximumStatistic;
@@ -102,6 +103,7 @@ public class ITestS3AInputStreamPerformance extends S3AScaleTestBase {
102103
@Override
103104
protected Configuration createScaleConfiguration() {
104105
Configuration conf = disablePrefetching(super.createScaleConfiguration());
106+
conf.setEnum(INPUT_STREAM_TYPE, Classic);
105107
if (isUsingDefaultExternalDataFile(conf)) {
106108
S3ATestUtils.removeBaseAndBucketOverrides(
107109
conf,

0 commit comments

Comments
 (0)