Skip to content

Commit 051f6c4

Browse files
committed
updates AAL version to 1.2.0
1 parent 198da21 commit 051f6c4

File tree

5 files changed

+4
-13
lines changed

5 files changed

+4
-13
lines changed

hadoop-project/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
<aws-java-sdk.version>1.12.720</aws-java-sdk.version>
208208
<aws-java-sdk-v2.version>2.29.52</aws-java-sdk-v2.version>
209209
<amazon-s3-encryption-client-java.version>3.1.1</amazon-s3-encryption-client-java.version>
210-
<amazon-s3-analyticsaccelerator-s3.version>1.0.0</amazon-s3-analyticsaccelerator-s3.version>
210+
<amazon-s3-analyticsaccelerator-s3.version>1.2.0</amazon-s3-analyticsaccelerator-s3.version>
211211
<aws.eventstream.version>1.0.1</aws.eventstream.version>
212212
<hsqldb.version>2.7.1</hsqldb.version>
213213
<frontend-maven-plugin.version>1.11.2</frontend-maven-plugin.version>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ protected boolean isClosed() {
214214
@Override
215215
protected void abortInFinalizer() {
216216
try {
217+
// stream was leaked: update statistic
218+
getS3AStreamStatistics().streamLeaked();
217219
close();
218220
} catch (IOException ignored) {
219221

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/contract/s3a/ITestS3AContractAnalyticsStreamVectoredRead.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.hadoop.fs.FileRange;
2929
import org.apache.hadoop.fs.contract.AbstractContractVectoredReadTest;
3030
import org.apache.hadoop.fs.contract.AbstractFSContract;
31-
import org.apache.hadoop.fs.contract.ContractTestUtils;
3231
import org.apache.hadoop.fs.statistics.IOStatistics;
3332
import org.apache.hadoop.fs.statistics.StreamStatisticNames;
3433

@@ -81,11 +80,6 @@ protected AbstractFSContract createContract(Configuration conf) {
8180
return new S3AContract(conf);
8281
}
8382

84-
@Override
85-
public void testNegativeOffsetRange() throws Exception {
86-
verifyExceptionalVectoredRead(ContractTestUtils.range(-1, 50), IllegalArgumentException.class);
87-
}
88-
8983
@Test
9084
public void testReadVectoredWithAALStatsCollection() throws Exception {
9185

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737

3838
import static org.apache.hadoop.fs.contract.ContractTestUtils.dataset;
3939
import static org.apache.hadoop.fs.s3a.S3ATestUtils.assume;
40-
import static org.apache.hadoop.fs.s3a.S3ATestUtils.skipIfAnalyticsAcceleratorEnabled;
4140
import static org.apache.hadoop.fs.statistics.IOStatisticAssertions.assertThatStatisticCounter;
4241
import static org.apache.hadoop.fs.statistics.StreamStatisticNames.STREAM_LEAKS;
4342
import static org.apache.hadoop.test.GenericTestUtils.LogCapturer.captureLogs;
@@ -90,10 +89,6 @@ public void setup() throws Exception {
9089
@Test
9190
public void testFinalizer() throws Throwable {
9291
Path path = methodPath();
93-
// Analytics accelerator currently does not support stream leak detection. This work is tracked
94-
// in https://issues.apache.org/jira/browse/HADOOP-19451
95-
skipIfAnalyticsAcceleratorEnabled(getConfiguration(),
96-
"Analytics Accelerator currently does not support leak detection");
9792

9893
final S3AFileSystem fs = getFileSystem();
9994

0 commit comments

Comments
 (0)