Skip to content

HADOOP-19245. S3A: S3ABlockOutputStream no longer sends progress events in close() #6974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 2, 2024
Merged

HADOOP-19245. S3A: S3ABlockOutputStream no longer sends progress events in close() #6974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,8 @@ private static class ProgressableListener implements ProgressListener {
this.progress = progress;
}

public void progressChanged(ProgressListenerEvent eventType, int bytesTransferred) {
@Override
public void progressChanged(ProgressListenerEvent eventType, long bytesTransferred) {
if (progress != null) {
progress.progress();
}
Expand Down
8 changes: 8 additions & 0 deletions ...ls/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/performance/ITestCreateFileCost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.concurrent.atomic.AtomicLong;

import org.assertj.core.api.Assertions;
import org.junit.Test;
Expand Down Expand Up @@ -213,8 +214,11 @@ public void testCreateFilePerformanceFlag() throws Throwable {
S3AFileSystem fs = getFileSystem();

Path path = methodPath();
// increment progress events
AtomicLong progressEvents = new AtomicLong(0);
FSDataOutputStreamBuilder builder = fs.createFile(path)
.overwrite(false)
.progress(progressEvents::incrementAndGet)
.recursive();

// this has a broken return type; something to do with the return value of
Expand All @@ -225,6 +229,10 @@ public void testCreateFilePerformanceFlag() throws Throwable {
always(NO_HEAD_OR_LIST),
with(OBJECT_BULK_DELETE_REQUEST, 0),
with(OBJECT_DELETE_REQUEST, 0));

Assertions.assertThat(progressEvents.get())
.describedAs("progress events")
.isGreaterThanOrEqualTo(1);
}

@Test
Expand Down