This is an automated email from the ASF dual-hosted git repository.
ahmar pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new d05b06430ce HADOOP-19559. S3A: Fixes failing AAL related unit tests.
(#8109) (#8117)
d05b06430ce is described below
commit d05b06430ceda477faebd6846b49f77dfdc1412c
Author: ahmarsuhail <[email protected]>
AuthorDate: Wed Dec 3 21:25:51 2025 +0000
HADOOP-19559. S3A: Fixes failing AAL related unit tests. (#8109) (#8117)
---
.../org/apache/hadoop/fs/s3a/impl/streams/AnalyticsStream.java | 1 +
.../java/org/apache/hadoop/fs/s3a/ITestS3AInputStreamLeakage.java | 5 -----
.../src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java | 2 +-
.../apache/hadoop/fs/s3a/impl/streams/TestStreamFactories.java | 8 ++++----
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git
a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/impl/streams/AnalyticsStream.java
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/impl/streams/AnalyticsStream.java
index 954ee3a0e48..48c2a920dd8 100644
---
a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/impl/streams/AnalyticsStream.java
+++
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/impl/streams/AnalyticsStream.java
@@ -227,6 +227,7 @@ protected boolean isClosed() {
@Override
protected void abortInFinalizer() {
+ getS3AStreamStatistics().streamLeaked();
try {
close();
} catch (IOException ignored) {
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AInputStreamLeakage.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AInputStreamLeakage.java
index f26a585776a..8ef4136bff0 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AInputStreamLeakage.java
+++
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AInputStreamLeakage.java
@@ -36,7 +36,6 @@
import static org.apache.hadoop.fs.contract.ContractTestUtils.dataset;
import static org.apache.hadoop.fs.s3a.S3ATestUtils.assume;
-import static
org.apache.hadoop.fs.s3a.S3ATestUtils.skipIfAnalyticsAcceleratorEnabled;
import static
org.apache.hadoop.fs.statistics.IOStatisticAssertions.assertThatStatisticCounter;
import static
org.apache.hadoop.fs.statistics.StreamStatisticNames.STREAM_LEAKS;
import static org.apache.hadoop.test.GenericTestUtils.LogCapturer.captureLogs;
@@ -88,10 +87,6 @@ public void setup() throws Exception {
@Test
public void testFinalizer() throws Throwable {
Path path = methodPath();
- // Analytics accelerator currently does not support stream leak detection.
This work is tracked
- // in https://issues.apache.org/jira/browse/HADOOP-19451
- skipIfAnalyticsAcceleratorEnabled(getConfiguration(),
- "Analytics Accelerator currently does not support leak detection");
final S3AFileSystem fs = getFileSystem();
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java
index 02a7419fa5a..957066f8608 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java
+++
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java
@@ -619,7 +619,7 @@ public static void skipIfAnalyticsAcceleratorEnabled(
public static boolean isAnalyticsAcceleratorEnabled(final Configuration
conf) {
return conf.get(INPUT_STREAM_TYPE,
- INPUT_STREAM_TYPE_CLASSIC).equals(INPUT_STREAM_TYPE_ANALYTICS);
+ INPUT_STREAM_TYPE_ANALYTICS).equals(INPUT_STREAM_TYPE_ANALYTICS);
}
/**
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/streams/TestStreamFactories.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/streams/TestStreamFactories.java
index fd27d4e63d9..238e2f00061 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/streams/TestStreamFactories.java
+++
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/streams/TestStreamFactories.java
@@ -55,14 +55,14 @@
public class TestStreamFactories extends AbstractHadoopTestBase {
/**
- * The empty string and "default" both map to the classic stream.
+ * The empty string and "default" both map to the analytics stream.
*/
@Test
public void testDefaultFactoryCreation() throws Throwable {
load("", DEFAULT_STREAM_TYPE,
- ClassicObjectInputStreamFactory.class);
+ AnalyticsStreamFactory.class);
load(INPUT_STREAM_TYPE_DEFAULT, DEFAULT_STREAM_TYPE,
- ClassicObjectInputStreamFactory.class);
+ AnalyticsStreamFactory.class);
}
/**
@@ -71,7 +71,7 @@ public void testDefaultFactoryCreation() throws Throwable {
@Test
public void testClassicFactoryCreation() throws Throwable {
final ClassicObjectInputStreamFactory f =
- load(INPUT_STREAM_TYPE_CLASSIC, DEFAULT_STREAM_TYPE,
+ load(INPUT_STREAM_TYPE_CLASSIC, InputStreamType.Classic,
ClassicObjectInputStreamFactory.class);
final StreamFactoryRequirements requirements = f.factoryRequirements();
Assertions.assertThat(requirements.requiresFuturePool())
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
