Skip to content

HDDS-5487. [Ozone-Streaming] BlockDataStreamOutput support FlushDelay. #3002

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
captainzmc merged 1 commit into from
Feb 14, 2022
Merged

HDDS-5487. [Ozone-Streaming] BlockDataStreamOutput support FlushDelay. #3002

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
10 changes: 9 additions & 1 deletion ...p-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ private void executePutBlock(boolean close,
} else {
byteBufferList = null;
}
flush();
waitFuturesComplete();
if (close) {
dataStreamCloseReply = out.closeAsync();
}
Expand Down Expand Up @@ -485,8 +485,16 @@ private void executePutBlock(boolean close,

@Override
public void flush() throws IOException {
if (xceiverClientFactory != null && xceiverClient != null
&& !config.isStreamBufferFlushDelay()) {
waitFuturesComplete();
}
}

public void waitFuturesComplete() throws IOException {
try {
CompletableFuture.allOf(futures.toArray(EMPTY_FUTURE_ARRAY)).get();
futures.clear();
} catch (Exception e) {
LOG.warn("Failed to write all chunks through stream: " + e);
throw new IOException(e);
Expand Down
1 change: 0 additions & 1 deletion ...tion-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ public static void init() throws Exception {
blockSize = 2 * maxFlushSize;

OzoneClientConfig clientConfig = conf.getObject(OzoneClientConfig.class);
clientConfig.setStreamBufferFlushDelay(false);
conf.setFromObject(clientConfig);

conf.setTimeDuration(HDDS_SCM_WATCHER_TIMEOUT, 1000, TimeUnit.MILLISECONDS);
Expand Down