Skip to content

HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.#3229

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
Mar 28, 2022
Merged

HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream. #3229

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
48 changes: 45 additions & 3 deletions ...p-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.BlockData;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfo;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.KeyValue;
import org.apache.hadoop.hdds.ratis.ContainerCommandRequestMessage;
Expand DownExpand Up@@ -83,6 +84,9 @@
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
public static final Logger LOG =
LoggerFactory.getLogger(BlockDataStreamOutput.class);

public static final int PUT_BLOCK_REQUEST_LENGTH_MAX = 1 << 20; // 1MB

public static final String EXCEPTION_MSG =
"Unexpected Storage Container Exception: ";
private static final CompletableFuture[] EMPTY_FUTURE_ARRAY = {};
Expand DownExpand Up@@ -406,12 +410,26 @@ private void executePutBlock(boolean close,
byteBufferList = null;
}
waitFuturesComplete();
final BlockData blockData = containerBlockData.build();
if (close) {
dataStreamCloseReply = out.closeAsync();
final ContainerCommandRequestProto putBlockRequest
= ContainerProtocolCalls.getPutBlockRequest(
xceiverClient.getPipeline(), blockData, true, token);
dataStreamCloseReply = executePutBlockClose(putBlockRequest,
PUT_BLOCK_REQUEST_LENGTH_MAX, out);
dataStreamCloseReply.whenComplete((reply, e) -> {
if (e != null || reply == null || !reply.isSuccess()) {
LOG.warn("Failed executePutBlockClose, reply=" + reply, e);
try {
executePutBlock(true, false);
} catch (IOException ex) {
throw new CompletionException(ex);
}
}
});
Comment thread
ivandika3 marked this conversation as resolved.
}

try {
BlockData blockData = containerBlockData.build();
XceiverClientReply asyncReply =
putBlockAsync(xceiverClient, blockData, close, token);
final CompletableFuture<ContainerCommandResponseProto> flushFuture
Expand DownExpand Up@@ -459,6 +477,30 @@ private void executePutBlock(boolean close,
}
}

public static CompletableFuture<DataStreamReply> executePutBlockClose(
ContainerCommandRequestProto putBlockRequest, int max,
DataStreamOutput out) {
final ByteBuffer putBlock = ContainerCommandRequestMessage.toMessage(
putBlockRequest, null).getContent().asReadOnlyByteBuffer();
final ByteBuffer protoLength = getProtoLength(putBlock, max);
RatisHelper.debug(putBlock, "putBlock", LOG);
out.writeAsync(putBlock);
RatisHelper.debug(protoLength, "protoLength", LOG);
return out.writeAsync(protoLength, StandardWriteOption.CLOSE);
}

public static ByteBuffer getProtoLength(ByteBuffer putBlock, int max) {
final int protoLength = putBlock.remaining();
Preconditions.checkState(protoLength <= max,
"protoLength== %s > max = %s", protoLength, max);
final ByteBuffer buffer = ByteBuffer.allocate(4);
buffer.putInt(protoLength);
buffer.flip();
LOG.debug("protoLength = {}", protoLength);
Preconditions.checkState(buffer.remaining() == 4);
return buffer.asReadOnlyBuffer();
}

@Override
public void flush() throws IOException {
if (xceiverClientFactory != null && xceiverClient != null
Expand DownExpand Up@@ -547,7 +589,7 @@ private void validateResponse(
}


private void setIoException(Exception e) {
private void setIoException(Throwable e) {
IOException ioe = getIoException();
if (ioe == null) {
IOException exception = new IOException(EXCEPTION_MSG + e.toString(), e);
Expand Down
26 changes: 26 additions & 0 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
package org.apache.hadoop.hdds.ratis;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -58,6 +59,7 @@
import org.apache.ratis.rpc.RpcType;
import org.apache.ratis.rpc.SupportedRpcType;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.io.netty.buffer.ByteBuf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand DownExpand Up@@ -436,4 +438,28 @@ private static <U> Class<? extends U> getClass(String name,
throw new RuntimeException(e);
}
}

public static void debug(ByteBuffer buffer, String name, Logger log) {
if (!log.isDebugEnabled()) {
return;
}
buffer = buffer.duplicate();
final StringBuilder builder = new StringBuilder();
for (int i = 1; buffer.remaining() > 0; i++) {
builder.append(buffer.get()).append(i % 20 == 0 ? "\n " : ", ");
}
log.debug("{}: {}\n {}", name, buffer, builder);
}

public static void debug(ByteBuf buf, String name, Logger log) {
if (!log.isDebugEnabled()) {
return;
}
buf = buf.duplicate();
final StringBuilder builder = new StringBuilder();
for (int i = 1; buf.readableBytes() > 0; i++) {
builder.append(buf.readByte()).append(i % 20 == 0 ? "\n " : ", ");
}
log.debug("{}: {}\n {}", name, buf, builder);
}
}
14 changes: 11 additions & 3 deletions ...-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.BlockNotCommittedException;
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerNotOpenException;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.ozone.common.Checksum;
import org.apache.hadoop.ozone.common.ChecksumData;
Expand DownExpand Up@@ -186,11 +187,19 @@ public static XceiverClientReply putBlockAsync(
XceiverClientSpi xceiverClient, BlockData containerBlockData, boolean eof,
Token<? extends TokenIdentifier> token)
throws IOException, InterruptedException, ExecutionException {
final ContainerCommandRequestProto request = getPutBlockRequest(
xceiverClient.getPipeline(), containerBlockData, eof, token);
return xceiverClient.sendCommandAsync(request);
}

public static ContainerCommandRequestProto getPutBlockRequest(
Pipeline pipeline, BlockData containerBlockData, boolean eof,
Token<? extends TokenIdentifier> token) throws IOException {
PutBlockRequestProto.Builder createBlockRequest =
PutBlockRequestProto.newBuilder()
.setBlockData(containerBlockData)
.setEof(eof);
String id = xceiverClient.getPipeline().getFirstNode().getUuidString();
final String id = pipeline.getFirstNode().getUuidString();
ContainerCommandRequestProto.Builder builder =
ContainerCommandRequestProto.newBuilder().setCmdType(Type.PutBlock)
.setContainerID(containerBlockData.getBlockID().getContainerID())
Expand All@@ -199,8 +208,7 @@ public static XceiverClientReply putBlockAsync(
if (token != null) {
builder.setEncodedToken(token.encodeToUrlString());
}
ContainerCommandRequestProto request = builder.build();
return xceiverClient.sendCommandAsync(request);
return builder.build();
}

/**
Expand Down
27 changes: 19 additions & 8 deletions ...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -427,6 +427,20 @@ private ContainerCommandResponseProto runCommand(
return dispatchCommand(requestProto, context);
}

private CompletableFuture<ContainerCommandResponseProto> runCommandAsync(
ContainerCommandRequestProto requestProto, LogEntryProto entry) {
return CompletableFuture.supplyAsync(() -> {
final DispatcherContext context = new DispatcherContext.Builder()
.setTerm(entry.getTerm())
.setLogIndex(entry.getIndex())
.setStage(DispatcherContext.WriteChunkStage.COMMIT_DATA)
.setContainer2BCSIDMap(container2BCSIDMap)
.build();

return runCommand(requestProto, context);
}, executor);
}

private CompletableFuture<Message> handleWriteChunk(
ContainerCommandRequestProto requestProto, long entryIndex, long term,
long startTime) {
Expand DownExpand Up@@ -560,19 +574,16 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
"DataStream: " + stream + " is not closed properly"));
}

final CompletableFuture<ContainerCommandResponseProto> f;
final ContainerCommandRequestProto request;
if (dataChannel instanceof KeyValueStreamDataChannel) {
f = CompletableFuture.completedFuture(null);
request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
} else {
return JavaUtils.completeExceptionally(new IllegalStateException(
"Unexpected DataChannel " + dataChannel.getClass()));
}
return f.whenComplete((res, e) -> {
if (LOG.isDebugEnabled()) {
LOG.debug("PutBlock {} Term: {} Index: {}",
res.getResult(), entry.getTerm(), entry.getIndex());
}
});
return runCommandAsync(request, entry).whenComplete(
(res, e) -> LOG.debug("link {}, entry: {}, request: {}",
res.getResult(), entry, request));
}

private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream. by szetszwo · Pull Request #3229 · apache/ozone · GitHub
Skip to content
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.#3229

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

Mar 28, 2022
 Merged


HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.
#3229
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


48 changes: 45 additions & 3 deletions
...p-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.BlockData;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfo;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.KeyValue;
import org.apache.hadoop.hdds.ratis.ContainerCommandRequestMessage;
Expand DownExpand Up@@ -83,6 +84,9 @@
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);

 public static final int PUT_BLOCK_REQUEST_LENGTH_MAX = 1 << 20; // 1MB

 public static final String EXCEPTION_MSG =
 "Unexpected Storage Container Exception: ";
 private static final CompletableFuture[] EMPTY_FUTURE_ARRAY = {};
Expand DownExpand Up@@ -406,12 +410,26 @@ private void executePutBlock(boolean close,
 byteBufferList = null;
 }
 waitFuturesComplete();
 final BlockData blockData = containerBlockData.build();
 if (close) {
 dataStreamCloseReply = out.closeAsync();
 final ContainerCommandRequestProto putBlockRequest
 = ContainerProtocolCalls.getPutBlockRequest(
 xceiverClient.getPipeline(), blockData, true, token);
 dataStreamCloseReply = executePutBlockClose(putBlockRequest,
 PUT_BLOCK_REQUEST_LENGTH_MAX, out);
 dataStreamCloseReply.whenComplete((reply, e) -> {
 if (e != null || reply == null || !reply.isSuccess()) {
 LOG.warn("Failed executePutBlockClose, reply=" + reply, e);
 try {
 executePutBlock(true, false);
 } catch (IOException ex) {
 throw new CompletionException(ex);
 }
 }
 });
Comment thread
ivandika3 marked this conversation as resolved.

 }

 try {
 BlockData blockData = containerBlockData.build();
 XceiverClientReply asyncReply =
 putBlockAsync(xceiverClient, blockData, close, token);
 final CompletableFuture<ContainerCommandResponseProto> flushFuture
Expand DownExpand Up@@ -459,6 +477,30 @@ private void executePutBlock(boolean close,
 }
 }

 public static CompletableFuture<DataStreamReply> executePutBlockClose(
 ContainerCommandRequestProto putBlockRequest, int max,
 DataStreamOutput out) {
 final ByteBuffer putBlock = ContainerCommandRequestMessage.toMessage(
 putBlockRequest, null).getContent().asReadOnlyByteBuffer();
 final ByteBuffer protoLength = getProtoLength(putBlock, max);
 RatisHelper.debug(putBlock, "putBlock", LOG);
 out.writeAsync(putBlock);
 RatisHelper.debug(protoLength, "protoLength", LOG);
 return out.writeAsync(protoLength, StandardWriteOption.CLOSE);
 }

 public static ByteBuffer getProtoLength(ByteBuffer putBlock, int max) {
 final int protoLength = putBlock.remaining();
 Preconditions.checkState(protoLength <= max,
 "protoLength== %s > max = %s", protoLength, max);
 final ByteBuffer buffer = ByteBuffer.allocate(4);
 buffer.putInt(protoLength);
 buffer.flip();
 LOG.debug("protoLength = {}", protoLength);
 Preconditions.checkState(buffer.remaining() == 4);
 return buffer.asReadOnlyBuffer();
 }

 @Override
 public void flush() throws IOException {
 if (xceiverClientFactory != null && xceiverClient != null
Expand DownExpand Up@@ -547,7 +589,7 @@ private void validateResponse(
 }


 private void setIoException(Exception e) {
 private void setIoException(Throwable e) {
 IOException ioe = getIoException();
 if (ioe == null) {
 IOException exception = new IOException(EXCEPTION_MSG + e.toString(), e);
Expand Down

26 changes: 26 additions & 0 deletions
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
package org.apache.hadoop.hdds.ratis;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -58,6 +59,7 @@
import org.apache.ratis.rpc.RpcType;
import org.apache.ratis.rpc.SupportedRpcType;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.io.netty.buffer.ByteBuf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand DownExpand Up@@ -436,4 +438,28 @@ private static <U> Class<? extends U> getClass(String name,
 throw new RuntimeException(e);
 }
 }

 public static void debug(ByteBuffer buffer, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buffer = buffer.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buffer.remaining() > 0; i++) {
 builder.append(buffer.get()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buffer, builder);
 }

 public static void debug(ByteBuf buf, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buf = buf.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buf.readableBytes() > 0; i++) {
 builder.append(buf.readByte()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buf, builder);
 }
}

14 changes: 11 additions & 3 deletions
...-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.BlockNotCommittedException;
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerNotOpenException;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.ozone.common.Checksum;
import org.apache.hadoop.ozone.common.ChecksumData;
Expand DownExpand Up@@ -186,11 +187,19 @@ public static XceiverClientReply putBlockAsync(
 XceiverClientSpi xceiverClient, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token)
 throws IOException, InterruptedException, ExecutionException {
 final ContainerCommandRequestProto request = getPutBlockRequest(
 xceiverClient.getPipeline(), containerBlockData, eof, token);
 return xceiverClient.sendCommandAsync(request);
 }

 public static ContainerCommandRequestProto getPutBlockRequest(
 Pipeline pipeline, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token) throws IOException {
 PutBlockRequestProto.Builder createBlockRequest =
 PutBlockRequestProto.newBuilder()
 .setBlockData(containerBlockData)
 .setEof(eof);
 String id = xceiverClient.getPipeline().getFirstNode().getUuidString();
final String id = pipeline.getFirstNode().getUuidString();
 ContainerCommandRequestProto.Builder builder =
 ContainerCommandRequestProto.newBuilder().setCmdType(Type.PutBlock)
 .setContainerID(containerBlockData.getBlockID().getContainerID())
Expand All@@ -199,8 +208,7 @@ public static XceiverClientReply putBlockAsync(
 if (token != null) {
 builder.setEncodedToken(token.encodeToUrlString());
 }
 ContainerCommandRequestProto request = builder.build();
 return xceiverClient.sendCommandAsync(request);
 return builder.build();
 }

 /**
Expand Down

27 changes: 19 additions & 8 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -427,6 +427,20 @@ private ContainerCommandResponseProto runCommand(
 return dispatchCommand(requestProto, context);
 }

 private CompletableFuture<ContainerCommandResponseProto> runCommandAsync(
 ContainerCommandRequestProto requestProto, LogEntryProto entry) {
 return CompletableFuture.supplyAsync(() -> {
 final DispatcherContext context = new DispatcherContext.Builder()
 .setTerm(entry.getTerm())
 .setLogIndex(entry.getIndex())
 .setStage(DispatcherContext.WriteChunkStage.COMMIT_DATA)
 .setContainer2BCSIDMap(container2BCSIDMap)
 .build();

 return runCommand(requestProto, context);
 }, executor);
 }

 private CompletableFuture<Message> handleWriteChunk(
 ContainerCommandRequestProto requestProto, long entryIndex, long term,
 long startTime) {
Expand DownExpand Up@@ -560,19 +574,16 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 "DataStream: " + stream + " is not closed properly"));
 }

 final CompletableFuture<ContainerCommandResponseProto> f;
 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
f = CompletableFuture.completedFuture(null);
request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return f.whenComplete((res, e) -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("PutBlock {} Term: {} Index: {}",
 res.getResult(), entry.getTerm(), entry.getIndex());
 }
 });
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream. by szetszwo · Pull Request #3229 · apache/ozone · GitHub
Skip to content
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.#3229

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

Mar 28, 2022
 Merged


HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.
#3229
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


48 changes: 45 additions & 3 deletions
...p-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.BlockData;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfo;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.KeyValue;
import org.apache.hadoop.hdds.ratis.ContainerCommandRequestMessage;
Expand DownExpand Up@@ -83,6 +84,9 @@
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);

 public static final int PUT_BLOCK_REQUEST_LENGTH_MAX = 1 << 20; // 1MB

 public static final String EXCEPTION_MSG =
 "Unexpected Storage Container Exception: ";
 private static final CompletableFuture[] EMPTY_FUTURE_ARRAY = {};
Expand DownExpand Up@@ -406,12 +410,26 @@ private void executePutBlock(boolean close,
 byteBufferList = null;
 }
 waitFuturesComplete();
 final BlockData blockData = containerBlockData.build();
 if (close) {
 dataStreamCloseReply = out.closeAsync();
 final ContainerCommandRequestProto putBlockRequest
 = ContainerProtocolCalls.getPutBlockRequest(
 xceiverClient.getPipeline(), blockData, true, token);
 dataStreamCloseReply = executePutBlockClose(putBlockRequest,
 PUT_BLOCK_REQUEST_LENGTH_MAX, out);
 dataStreamCloseReply.whenComplete((reply, e) -> {
 if (e != null || reply == null || !reply.isSuccess()) {
 LOG.warn("Failed executePutBlockClose, reply=" + reply, e);
 try {
 executePutBlock(true, false);
 } catch (IOException ex) {
 throw new CompletionException(ex);
 }
 }
 });
Comment thread
ivandika3 marked this conversation as resolved.

 }

 try {
 BlockData blockData = containerBlockData.build();
 XceiverClientReply asyncReply =
 putBlockAsync(xceiverClient, blockData, close, token);
 final CompletableFuture<ContainerCommandResponseProto> flushFuture
Expand DownExpand Up@@ -459,6 +477,30 @@ private void executePutBlock(boolean close,
 }
 }

 public static CompletableFuture<DataStreamReply> executePutBlockClose(
 ContainerCommandRequestProto putBlockRequest, int max,
 DataStreamOutput out) {
 final ByteBuffer putBlock = ContainerCommandRequestMessage.toMessage(
 putBlockRequest, null).getContent().asReadOnlyByteBuffer();
 final ByteBuffer protoLength = getProtoLength(putBlock, max);
 RatisHelper.debug(putBlock, "putBlock", LOG);
 out.writeAsync(putBlock);
 RatisHelper.debug(protoLength, "protoLength", LOG);
 return out.writeAsync(protoLength, StandardWriteOption.CLOSE);
 }

 public static ByteBuffer getProtoLength(ByteBuffer putBlock, int max) {
 final int protoLength = putBlock.remaining();
 Preconditions.checkState(protoLength <= max,
 "protoLength== %s > max = %s", protoLength, max);
 final ByteBuffer buffer = ByteBuffer.allocate(4);
 buffer.putInt(protoLength);
 buffer.flip();
 LOG.debug("protoLength = {}", protoLength);
 Preconditions.checkState(buffer.remaining() == 4);
 return buffer.asReadOnlyBuffer();
 }

 @Override
 public void flush() throws IOException {
 if (xceiverClientFactory != null && xceiverClient != null
Expand DownExpand Up@@ -547,7 +589,7 @@ private void validateResponse(
 }


 private void setIoException(Exception e) {
 private void setIoException(Throwable e) {
 IOException ioe = getIoException();
 if (ioe == null) {
 IOException exception = new IOException(EXCEPTION_MSG + e.toString(), e);
Expand Down

26 changes: 26 additions & 0 deletions
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
package org.apache.hadoop.hdds.ratis;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -58,6 +59,7 @@
import org.apache.ratis.rpc.RpcType;
import org.apache.ratis.rpc.SupportedRpcType;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.io.netty.buffer.ByteBuf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand DownExpand Up@@ -436,4 +438,28 @@ private static <U> Class<? extends U> getClass(String name,
 throw new RuntimeException(e);
 }
 }

 public static void debug(ByteBuffer buffer, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buffer = buffer.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buffer.remaining() > 0; i++) {
 builder.append(buffer.get()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buffer, builder);
 }

 public static void debug(ByteBuf buf, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buf = buf.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buf.readableBytes() > 0; i++) {
 builder.append(buf.readByte()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buf, builder);
 }
}

14 changes: 11 additions & 3 deletions
...-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.BlockNotCommittedException;
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerNotOpenException;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.ozone.common.Checksum;
import org.apache.hadoop.ozone.common.ChecksumData;
Expand DownExpand Up@@ -186,11 +187,19 @@ public static XceiverClientReply putBlockAsync(
 XceiverClientSpi xceiverClient, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token)
 throws IOException, InterruptedException, ExecutionException {
 final ContainerCommandRequestProto request = getPutBlockRequest(
 xceiverClient.getPipeline(), containerBlockData, eof, token);
 return xceiverClient.sendCommandAsync(request);
 }

 public static ContainerCommandRequestProto getPutBlockRequest(
 Pipeline pipeline, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token) throws IOException {
 PutBlockRequestProto.Builder createBlockRequest =
 PutBlockRequestProto.newBuilder()
 .setBlockData(containerBlockData)
 .setEof(eof);
 String id = xceiverClient.getPipeline().getFirstNode().getUuidString();
final String id = pipeline.getFirstNode().getUuidString();
 ContainerCommandRequestProto.Builder builder =
 ContainerCommandRequestProto.newBuilder().setCmdType(Type.PutBlock)
 .setContainerID(containerBlockData.getBlockID().getContainerID())
Expand All@@ -199,8 +208,7 @@ public static XceiverClientReply putBlockAsync(
 if (token != null) {
 builder.setEncodedToken(token.encodeToUrlString());
 }
 ContainerCommandRequestProto request = builder.build();
 return xceiverClient.sendCommandAsync(request);
 return builder.build();
 }

 /**
Expand Down

27 changes: 19 additions & 8 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -427,6 +427,20 @@ private ContainerCommandResponseProto runCommand(
 return dispatchCommand(requestProto, context);
 }

 private CompletableFuture<ContainerCommandResponseProto> runCommandAsync(
 ContainerCommandRequestProto requestProto, LogEntryProto entry) {
 return CompletableFuture.supplyAsync(() -> {
 final DispatcherContext context = new DispatcherContext.Builder()
 .setTerm(entry.getTerm())
 .setLogIndex(entry.getIndex())
 .setStage(DispatcherContext.WriteChunkStage.COMMIT_DATA)
 .setContainer2BCSIDMap(container2BCSIDMap)
 .build();

 return runCommand(requestProto, context);
 }, executor);
 }

 private CompletableFuture<Message> handleWriteChunk(
 ContainerCommandRequestProto requestProto, long entryIndex, long term,
 long startTime) {
Expand DownExpand Up@@ -560,19 +574,16 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 "DataStream: " + stream + " is not closed properly"));
 }

 final CompletableFuture<ContainerCommandResponseProto> f;
 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
f = CompletableFuture.completedFuture(null);
request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return f.whenComplete((res, e) -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("PutBlock {} Term: {} Index: {}",
 res.getResult(), entry.getTerm(), entry.getIndex());
 }
 });
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream. by szetszwo · Pull Request #3229 · apache/ozone · GitHub
Skip to content
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.#3229

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

Mar 28, 2022
 Merged


HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.
#3229
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


48 changes: 45 additions & 3 deletions
...p-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.BlockData;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfo;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.KeyValue;
import org.apache.hadoop.hdds.ratis.ContainerCommandRequestMessage;
Expand DownExpand Up@@ -83,6 +84,9 @@
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);

 public static final int PUT_BLOCK_REQUEST_LENGTH_MAX = 1 << 20; // 1MB

 public static final String EXCEPTION_MSG =
 "Unexpected Storage Container Exception: ";
 private static final CompletableFuture[] EMPTY_FUTURE_ARRAY = {};
Expand DownExpand Up@@ -406,12 +410,26 @@ private void executePutBlock(boolean close,
 byteBufferList = null;
 }
 waitFuturesComplete();
 final BlockData blockData = containerBlockData.build();
 if (close) {
 dataStreamCloseReply = out.closeAsync();
 final ContainerCommandRequestProto putBlockRequest
 = ContainerProtocolCalls.getPutBlockRequest(
 xceiverClient.getPipeline(), blockData, true, token);
 dataStreamCloseReply = executePutBlockClose(putBlockRequest,
 PUT_BLOCK_REQUEST_LENGTH_MAX, out);
 dataStreamCloseReply.whenComplete((reply, e) -> {
 if (e != null || reply == null || !reply.isSuccess()) {
 LOG.warn("Failed executePutBlockClose, reply=" + reply, e);
 try {
 executePutBlock(true, false);
 } catch (IOException ex) {
 throw new CompletionException(ex);
 }
 }
 });
Comment thread
ivandika3 marked this conversation as resolved.

 }

 try {
 BlockData blockData = containerBlockData.build();
 XceiverClientReply asyncReply =
 putBlockAsync(xceiverClient, blockData, close, token);
 final CompletableFuture<ContainerCommandResponseProto> flushFuture
Expand DownExpand Up@@ -459,6 +477,30 @@ private void executePutBlock(boolean close,
 }
 }

 public static CompletableFuture<DataStreamReply> executePutBlockClose(
 ContainerCommandRequestProto putBlockRequest, int max,
 DataStreamOutput out) {
 final ByteBuffer putBlock = ContainerCommandRequestMessage.toMessage(
 putBlockRequest, null).getContent().asReadOnlyByteBuffer();
 final ByteBuffer protoLength = getProtoLength(putBlock, max);
 RatisHelper.debug(putBlock, "putBlock", LOG);
 out.writeAsync(putBlock);
 RatisHelper.debug(protoLength, "protoLength", LOG);
 return out.writeAsync(protoLength, StandardWriteOption.CLOSE);
 }

 public static ByteBuffer getProtoLength(ByteBuffer putBlock, int max) {
 final int protoLength = putBlock.remaining();
 Preconditions.checkState(protoLength <= max,
 "protoLength== %s > max = %s", protoLength, max);
 final ByteBuffer buffer = ByteBuffer.allocate(4);
 buffer.putInt(protoLength);
 buffer.flip();
 LOG.debug("protoLength = {}", protoLength);
 Preconditions.checkState(buffer.remaining() == 4);
 return buffer.asReadOnlyBuffer();
 }

 @Override
 public void flush() throws IOException {
 if (xceiverClientFactory != null && xceiverClient != null
Expand DownExpand Up@@ -547,7 +589,7 @@ private void validateResponse(
 }


 private void setIoException(Exception e) {
 private void setIoException(Throwable e) {
 IOException ioe = getIoException();
 if (ioe == null) {
 IOException exception = new IOException(EXCEPTION_MSG + e.toString(), e);
Expand Down

26 changes: 26 additions & 0 deletions
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
package org.apache.hadoop.hdds.ratis;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -58,6 +59,7 @@
import org.apache.ratis.rpc.RpcType;
import org.apache.ratis.rpc.SupportedRpcType;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.io.netty.buffer.ByteBuf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand DownExpand Up@@ -436,4 +438,28 @@ private static <U> Class<? extends U> getClass(String name,
 throw new RuntimeException(e);
 }
 }

 public static void debug(ByteBuffer buffer, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buffer = buffer.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buffer.remaining() > 0; i++) {
 builder.append(buffer.get()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buffer, builder);
 }

 public static void debug(ByteBuf buf, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buf = buf.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buf.readableBytes() > 0; i++) {
 builder.append(buf.readByte()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buf, builder);
 }
}

14 changes: 11 additions & 3 deletions
...-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.BlockNotCommittedException;
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerNotOpenException;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.ozone.common.Checksum;
import org.apache.hadoop.ozone.common.ChecksumData;
Expand DownExpand Up@@ -186,11 +187,19 @@ public static XceiverClientReply putBlockAsync(
 XceiverClientSpi xceiverClient, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token)
 throws IOException, InterruptedException, ExecutionException {
 final ContainerCommandRequestProto request = getPutBlockRequest(
 xceiverClient.getPipeline(), containerBlockData, eof, token);
 return xceiverClient.sendCommandAsync(request);
 }

 public static ContainerCommandRequestProto getPutBlockRequest(
 Pipeline pipeline, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token) throws IOException {
 PutBlockRequestProto.Builder createBlockRequest =
 PutBlockRequestProto.newBuilder()
 .setBlockData(containerBlockData)
 .setEof(eof);
 String id = xceiverClient.getPipeline().getFirstNode().getUuidString();
final String id = pipeline.getFirstNode().getUuidString();
 ContainerCommandRequestProto.Builder builder =
 ContainerCommandRequestProto.newBuilder().setCmdType(Type.PutBlock)
 .setContainerID(containerBlockData.getBlockID().getContainerID())
Expand All@@ -199,8 +208,7 @@ public static XceiverClientReply putBlockAsync(
 if (token != null) {
 builder.setEncodedToken(token.encodeToUrlString());
 }
 ContainerCommandRequestProto request = builder.build();
 return xceiverClient.sendCommandAsync(request);
 return builder.build();
 }

 /**
Expand Down

27 changes: 19 additions & 8 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -427,6 +427,20 @@ private ContainerCommandResponseProto runCommand(
 return dispatchCommand(requestProto, context);
 }

 private CompletableFuture<ContainerCommandResponseProto> runCommandAsync(
 ContainerCommandRequestProto requestProto, LogEntryProto entry) {
 return CompletableFuture.supplyAsync(() -> {
 final DispatcherContext context = new DispatcherContext.Builder()
 .setTerm(entry.getTerm())
 .setLogIndex(entry.getIndex())
 .setStage(DispatcherContext.WriteChunkStage.COMMIT_DATA)
 .setContainer2BCSIDMap(container2BCSIDMap)
 .build();

 return runCommand(requestProto, context);
 }, executor);
 }

 private CompletableFuture<Message> handleWriteChunk(
 ContainerCommandRequestProto requestProto, long entryIndex, long term,
 long startTime) {
Expand DownExpand Up@@ -560,19 +574,16 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 "DataStream: " + stream + " is not closed properly"));
 }

 final CompletableFuture<ContainerCommandResponseProto> f;
 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
f = CompletableFuture.completedFuture(null);
request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return f.whenComplete((res, e) -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("PutBlock {} Term: {} Index: {}",
 res.getResult(), entry.getTerm(), entry.getIndex());
 }
 });
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream. by szetszwo · Pull Request #3229 · apache/ozone · GitHub
Skip to content
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.#3229

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

Mar 28, 2022
 Merged


HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.
#3229
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


48 changes: 45 additions & 3 deletions
...p-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.BlockData;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfo;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.KeyValue;
import org.apache.hadoop.hdds.ratis.ContainerCommandRequestMessage;
Expand DownExpand Up@@ -83,6 +84,9 @@
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);

 public static final int PUT_BLOCK_REQUEST_LENGTH_MAX = 1 << 20; // 1MB

 public static final String EXCEPTION_MSG =
 "Unexpected Storage Container Exception: ";
 private static final CompletableFuture[] EMPTY_FUTURE_ARRAY = {};
Expand DownExpand Up@@ -406,12 +410,26 @@ private void executePutBlock(boolean close,
 byteBufferList = null;
 }
 waitFuturesComplete();
 final BlockData blockData = containerBlockData.build();
 if (close) {
 dataStreamCloseReply = out.closeAsync();
 final ContainerCommandRequestProto putBlockRequest
 = ContainerProtocolCalls.getPutBlockRequest(
 xceiverClient.getPipeline(), blockData, true, token);
 dataStreamCloseReply = executePutBlockClose(putBlockRequest,
 PUT_BLOCK_REQUEST_LENGTH_MAX, out);
 dataStreamCloseReply.whenComplete((reply, e) -> {
 if (e != null || reply == null || !reply.isSuccess()) {
 LOG.warn("Failed executePutBlockClose, reply=" + reply, e);
 try {
 executePutBlock(true, false);
 } catch (IOException ex) {
 throw new CompletionException(ex);
 }
 }
 });
Comment thread
ivandika3 marked this conversation as resolved.

 }

 try {
 BlockData blockData = containerBlockData.build();
 XceiverClientReply asyncReply =
 putBlockAsync(xceiverClient, blockData, close, token);
 final CompletableFuture<ContainerCommandResponseProto> flushFuture
Expand DownExpand Up@@ -459,6 +477,30 @@ private void executePutBlock(boolean close,
 }
 }

 public static CompletableFuture<DataStreamReply> executePutBlockClose(
 ContainerCommandRequestProto putBlockRequest, int max,
 DataStreamOutput out) {
 final ByteBuffer putBlock = ContainerCommandRequestMessage.toMessage(
 putBlockRequest, null).getContent().asReadOnlyByteBuffer();
 final ByteBuffer protoLength = getProtoLength(putBlock, max);
 RatisHelper.debug(putBlock, "putBlock", LOG);
 out.writeAsync(putBlock);
 RatisHelper.debug(protoLength, "protoLength", LOG);
 return out.writeAsync(protoLength, StandardWriteOption.CLOSE);
 }

 public static ByteBuffer getProtoLength(ByteBuffer putBlock, int max) {
 final int protoLength = putBlock.remaining();
 Preconditions.checkState(protoLength <= max,
 "protoLength== %s > max = %s", protoLength, max);
 final ByteBuffer buffer = ByteBuffer.allocate(4);
 buffer.putInt(protoLength);
 buffer.flip();
 LOG.debug("protoLength = {}", protoLength);
 Preconditions.checkState(buffer.remaining() == 4);
 return buffer.asReadOnlyBuffer();
 }

 @Override
 public void flush() throws IOException {
 if (xceiverClientFactory != null && xceiverClient != null
Expand DownExpand Up@@ -547,7 +589,7 @@ private void validateResponse(
 }


 private void setIoException(Exception e) {
 private void setIoException(Throwable e) {
 IOException ioe = getIoException();
 if (ioe == null) {
 IOException exception = new IOException(EXCEPTION_MSG + e.toString(), e);
Expand Down

26 changes: 26 additions & 0 deletions
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
package org.apache.hadoop.hdds.ratis;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -58,6 +59,7 @@
import org.apache.ratis.rpc.RpcType;
import org.apache.ratis.rpc.SupportedRpcType;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.io.netty.buffer.ByteBuf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand DownExpand Up@@ -436,4 +438,28 @@ private static <U> Class<? extends U> getClass(String name,
 throw new RuntimeException(e);
 }
 }

 public static void debug(ByteBuffer buffer, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buffer = buffer.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buffer.remaining() > 0; i++) {
 builder.append(buffer.get()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buffer, builder);
 }

 public static void debug(ByteBuf buf, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buf = buf.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buf.readableBytes() > 0; i++) {
 builder.append(buf.readByte()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buf, builder);
 }
}

14 changes: 11 additions & 3 deletions
...-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.BlockNotCommittedException;
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerNotOpenException;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.ozone.common.Checksum;
import org.apache.hadoop.ozone.common.ChecksumData;
Expand DownExpand Up@@ -186,11 +187,19 @@ public static XceiverClientReply putBlockAsync(
 XceiverClientSpi xceiverClient, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token)
 throws IOException, InterruptedException, ExecutionException {
 final ContainerCommandRequestProto request = getPutBlockRequest(
 xceiverClient.getPipeline(), containerBlockData, eof, token);
 return xceiverClient.sendCommandAsync(request);
 }

 public static ContainerCommandRequestProto getPutBlockRequest(
 Pipeline pipeline, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token) throws IOException {
 PutBlockRequestProto.Builder createBlockRequest =
 PutBlockRequestProto.newBuilder()
 .setBlockData(containerBlockData)
 .setEof(eof);
 String id = xceiverClient.getPipeline().getFirstNode().getUuidString();
final String id = pipeline.getFirstNode().getUuidString();
 ContainerCommandRequestProto.Builder builder =
 ContainerCommandRequestProto.newBuilder().setCmdType(Type.PutBlock)
 .setContainerID(containerBlockData.getBlockID().getContainerID())
Expand All@@ -199,8 +208,7 @@ public static XceiverClientReply putBlockAsync(
 if (token != null) {
 builder.setEncodedToken(token.encodeToUrlString());
 }
 ContainerCommandRequestProto request = builder.build();
 return xceiverClient.sendCommandAsync(request);
 return builder.build();
 }

 /**
Expand Down

27 changes: 19 additions & 8 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -427,6 +427,20 @@ private ContainerCommandResponseProto runCommand(
 return dispatchCommand(requestProto, context);
 }

 private CompletableFuture<ContainerCommandResponseProto> runCommandAsync(
 ContainerCommandRequestProto requestProto, LogEntryProto entry) {
 return CompletableFuture.supplyAsync(() -> {
 final DispatcherContext context = new DispatcherContext.Builder()
 .setTerm(entry.getTerm())
 .setLogIndex(entry.getIndex())
 .setStage(DispatcherContext.WriteChunkStage.COMMIT_DATA)
 .setContainer2BCSIDMap(container2BCSIDMap)
 .build();

 return runCommand(requestProto, context);
 }, executor);
 }

 private CompletableFuture<Message> handleWriteChunk(
 ContainerCommandRequestProto requestProto, long entryIndex, long term,
 long startTime) {
Expand DownExpand Up@@ -560,19 +574,16 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 "DataStream: " + stream + " is not closed properly"));
 }

 final CompletableFuture<ContainerCommandResponseProto> f;
 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
f = CompletableFuture.completedFuture(null);
request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return f.whenComplete((res, e) -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("PutBlock {} Term: {} Index: {}",
 res.getResult(), entry.getTerm(), entry.getIndex());
 }
 });
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream. by szetszwo · Pull Request #3229 · apache/ozone · GitHub
Skip to content
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.#3229

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

Mar 28, 2022
 Merged


HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.
#3229
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


48 changes: 45 additions & 3 deletions
...p-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.BlockData;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfo;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.KeyValue;
import org.apache.hadoop.hdds.ratis.ContainerCommandRequestMessage;
Expand DownExpand Up@@ -83,6 +84,9 @@
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);

 public static final int PUT_BLOCK_REQUEST_LENGTH_MAX = 1 << 20; // 1MB

 public static final String EXCEPTION_MSG =
 "Unexpected Storage Container Exception: ";
 private static final CompletableFuture[] EMPTY_FUTURE_ARRAY = {};
Expand DownExpand Up@@ -406,12 +410,26 @@ private void executePutBlock(boolean close,
 byteBufferList = null;
 }
 waitFuturesComplete();
 final BlockData blockData = containerBlockData.build();
 if (close) {
 dataStreamCloseReply = out.closeAsync();
 final ContainerCommandRequestProto putBlockRequest
 = ContainerProtocolCalls.getPutBlockRequest(
 xceiverClient.getPipeline(), blockData, true, token);
 dataStreamCloseReply = executePutBlockClose(putBlockRequest,
 PUT_BLOCK_REQUEST_LENGTH_MAX, out);
 dataStreamCloseReply.whenComplete((reply, e) -> {
 if (e != null || reply == null || !reply.isSuccess()) {
 LOG.warn("Failed executePutBlockClose, reply=" + reply, e);
 try {
 executePutBlock(true, false);
 } catch (IOException ex) {
 throw new CompletionException(ex);
 }
 }
 });
Comment thread
ivandika3 marked this conversation as resolved.

 }

 try {
 BlockData blockData = containerBlockData.build();
 XceiverClientReply asyncReply =
 putBlockAsync(xceiverClient, blockData, close, token);
 final CompletableFuture<ContainerCommandResponseProto> flushFuture
Expand DownExpand Up@@ -459,6 +477,30 @@ private void executePutBlock(boolean close,
 }
 }

 public static CompletableFuture<DataStreamReply> executePutBlockClose(
 ContainerCommandRequestProto putBlockRequest, int max,
 DataStreamOutput out) {
 final ByteBuffer putBlock = ContainerCommandRequestMessage.toMessage(
 putBlockRequest, null).getContent().asReadOnlyByteBuffer();
 final ByteBuffer protoLength = getProtoLength(putBlock, max);
 RatisHelper.debug(putBlock, "putBlock", LOG);
 out.writeAsync(putBlock);
 RatisHelper.debug(protoLength, "protoLength", LOG);
 return out.writeAsync(protoLength, StandardWriteOption.CLOSE);
 }

 public static ByteBuffer getProtoLength(ByteBuffer putBlock, int max) {
 final int protoLength = putBlock.remaining();
 Preconditions.checkState(protoLength <= max,
 "protoLength== %s > max = %s", protoLength, max);
 final ByteBuffer buffer = ByteBuffer.allocate(4);
 buffer.putInt(protoLength);
 buffer.flip();
 LOG.debug("protoLength = {}", protoLength);
 Preconditions.checkState(buffer.remaining() == 4);
 return buffer.asReadOnlyBuffer();
 }

 @Override
 public void flush() throws IOException {
 if (xceiverClientFactory != null && xceiverClient != null
Expand DownExpand Up@@ -547,7 +589,7 @@ private void validateResponse(
 }


 private void setIoException(Exception e) {
 private void setIoException(Throwable e) {
 IOException ioe = getIoException();
 if (ioe == null) {
 IOException exception = new IOException(EXCEPTION_MSG + e.toString(), e);
Expand Down

26 changes: 26 additions & 0 deletions
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
package org.apache.hadoop.hdds.ratis;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -58,6 +59,7 @@
import org.apache.ratis.rpc.RpcType;
import org.apache.ratis.rpc.SupportedRpcType;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.io.netty.buffer.ByteBuf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand DownExpand Up@@ -436,4 +438,28 @@ private static <U> Class<? extends U> getClass(String name,
 throw new RuntimeException(e);
 }
 }

 public static void debug(ByteBuffer buffer, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buffer = buffer.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buffer.remaining() > 0; i++) {
 builder.append(buffer.get()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buffer, builder);
 }

 public static void debug(ByteBuf buf, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buf = buf.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buf.readableBytes() > 0; i++) {
 builder.append(buf.readByte()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buf, builder);
 }
}

14 changes: 11 additions & 3 deletions
...-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.BlockNotCommittedException;
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerNotOpenException;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.ozone.common.Checksum;
import org.apache.hadoop.ozone.common.ChecksumData;
Expand DownExpand Up@@ -186,11 +187,19 @@ public static XceiverClientReply putBlockAsync(
 XceiverClientSpi xceiverClient, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token)
 throws IOException, InterruptedException, ExecutionException {
 final ContainerCommandRequestProto request = getPutBlockRequest(
 xceiverClient.getPipeline(), containerBlockData, eof, token);
 return xceiverClient.sendCommandAsync(request);
 }

 public static ContainerCommandRequestProto getPutBlockRequest(
 Pipeline pipeline, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token) throws IOException {
 PutBlockRequestProto.Builder createBlockRequest =
 PutBlockRequestProto.newBuilder()
 .setBlockData(containerBlockData)
 .setEof(eof);
 String id = xceiverClient.getPipeline().getFirstNode().getUuidString();
final String id = pipeline.getFirstNode().getUuidString();
 ContainerCommandRequestProto.Builder builder =
 ContainerCommandRequestProto.newBuilder().setCmdType(Type.PutBlock)
 .setContainerID(containerBlockData.getBlockID().getContainerID())
Expand All@@ -199,8 +208,7 @@ public static XceiverClientReply putBlockAsync(
 if (token != null) {
 builder.setEncodedToken(token.encodeToUrlString());
 }
 ContainerCommandRequestProto request = builder.build();
 return xceiverClient.sendCommandAsync(request);
 return builder.build();
 }

 /**
Expand Down

27 changes: 19 additions & 8 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -427,6 +427,20 @@ private ContainerCommandResponseProto runCommand(
 return dispatchCommand(requestProto, context);
 }

 private CompletableFuture<ContainerCommandResponseProto> runCommandAsync(
 ContainerCommandRequestProto requestProto, LogEntryProto entry) {
 return CompletableFuture.supplyAsync(() -> {
 final DispatcherContext context = new DispatcherContext.Builder()
 .setTerm(entry.getTerm())
 .setLogIndex(entry.getIndex())
 .setStage(DispatcherContext.WriteChunkStage.COMMIT_DATA)
 .setContainer2BCSIDMap(container2BCSIDMap)
 .build();

 return runCommand(requestProto, context);
 }, executor);
 }

 private CompletableFuture<Message> handleWriteChunk(
 ContainerCommandRequestProto requestProto, long entryIndex, long term,
 long startTime) {
Expand DownExpand Up@@ -560,19 +574,16 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 "DataStream: " + stream + " is not closed properly"));
 }

 final CompletableFuture<ContainerCommandResponseProto> f;
 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
f = CompletableFuture.completedFuture(null);
request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return f.whenComplete((res, e) -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("PutBlock {} Term: {} Index: {}",
 res.getResult(), entry.getTerm(), entry.getIndex());
 }
 });
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream. by szetszwo · Pull Request #3229 · apache/ozone · GitHub
Skip to content
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.#3229

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

Mar 28, 2022
 Merged


HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.
#3229
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


48 changes: 45 additions & 3 deletions
...p-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.BlockData;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfo;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.KeyValue;
import org.apache.hadoop.hdds.ratis.ContainerCommandRequestMessage;
Expand DownExpand Up@@ -83,6 +84,9 @@
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);

 public static final int PUT_BLOCK_REQUEST_LENGTH_MAX = 1 << 20; // 1MB

 public static final String EXCEPTION_MSG =
 "Unexpected Storage Container Exception: ";
 private static final CompletableFuture[] EMPTY_FUTURE_ARRAY = {};
Expand DownExpand Up@@ -406,12 +410,26 @@ private void executePutBlock(boolean close,
 byteBufferList = null;
 }
 waitFuturesComplete();
 final BlockData blockData = containerBlockData.build();
 if (close) {
 dataStreamCloseReply = out.closeAsync();
 final ContainerCommandRequestProto putBlockRequest
 = ContainerProtocolCalls.getPutBlockRequest(
 xceiverClient.getPipeline(), blockData, true, token);
 dataStreamCloseReply = executePutBlockClose(putBlockRequest,
 PUT_BLOCK_REQUEST_LENGTH_MAX, out);
 dataStreamCloseReply.whenComplete((reply, e) -> {
 if (e != null || reply == null || !reply.isSuccess()) {
 LOG.warn("Failed executePutBlockClose, reply=" + reply, e);
 try {
 executePutBlock(true, false);
 } catch (IOException ex) {
 throw new CompletionException(ex);
 }
 }
 });
Comment thread
ivandika3 marked this conversation as resolved.

 }

 try {
 BlockData blockData = containerBlockData.build();
 XceiverClientReply asyncReply =
 putBlockAsync(xceiverClient, blockData, close, token);
 final CompletableFuture<ContainerCommandResponseProto> flushFuture
Expand DownExpand Up@@ -459,6 +477,30 @@ private void executePutBlock(boolean close,
 }
 }

 public static CompletableFuture<DataStreamReply> executePutBlockClose(
 ContainerCommandRequestProto putBlockRequest, int max,
 DataStreamOutput out) {
 final ByteBuffer putBlock = ContainerCommandRequestMessage.toMessage(
 putBlockRequest, null).getContent().asReadOnlyByteBuffer();
 final ByteBuffer protoLength = getProtoLength(putBlock, max);
 RatisHelper.debug(putBlock, "putBlock", LOG);
 out.writeAsync(putBlock);
 RatisHelper.debug(protoLength, "protoLength", LOG);
 return out.writeAsync(protoLength, StandardWriteOption.CLOSE);
 }

 public static ByteBuffer getProtoLength(ByteBuffer putBlock, int max) {
 final int protoLength = putBlock.remaining();
 Preconditions.checkState(protoLength <= max,
 "protoLength== %s > max = %s", protoLength, max);
 final ByteBuffer buffer = ByteBuffer.allocate(4);
 buffer.putInt(protoLength);
 buffer.flip();
 LOG.debug("protoLength = {}", protoLength);
 Preconditions.checkState(buffer.remaining() == 4);
 return buffer.asReadOnlyBuffer();
 }

 @Override
 public void flush() throws IOException {
 if (xceiverClientFactory != null && xceiverClient != null
Expand DownExpand Up@@ -547,7 +589,7 @@ private void validateResponse(
 }


 private void setIoException(Exception e) {
 private void setIoException(Throwable e) {
 IOException ioe = getIoException();
 if (ioe == null) {
 IOException exception = new IOException(EXCEPTION_MSG + e.toString(), e);
Expand Down

26 changes: 26 additions & 0 deletions
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
package org.apache.hadoop.hdds.ratis;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -58,6 +59,7 @@
import org.apache.ratis.rpc.RpcType;
import org.apache.ratis.rpc.SupportedRpcType;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.io.netty.buffer.ByteBuf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand DownExpand Up@@ -436,4 +438,28 @@ private static <U> Class<? extends U> getClass(String name,
 throw new RuntimeException(e);
 }
 }

 public static void debug(ByteBuffer buffer, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buffer = buffer.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buffer.remaining() > 0; i++) {
 builder.append(buffer.get()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buffer, builder);
 }

 public static void debug(ByteBuf buf, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buf = buf.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buf.readableBytes() > 0; i++) {
 builder.append(buf.readByte()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buf, builder);
 }
}

14 changes: 11 additions & 3 deletions
...-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.BlockNotCommittedException;
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerNotOpenException;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.ozone.common.Checksum;
import org.apache.hadoop.ozone.common.ChecksumData;
Expand DownExpand Up@@ -186,11 +187,19 @@ public static XceiverClientReply putBlockAsync(
 XceiverClientSpi xceiverClient, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token)
 throws IOException, InterruptedException, ExecutionException {
 final ContainerCommandRequestProto request = getPutBlockRequest(
 xceiverClient.getPipeline(), containerBlockData, eof, token);
 return xceiverClient.sendCommandAsync(request);
 }

 public static ContainerCommandRequestProto getPutBlockRequest(
 Pipeline pipeline, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token) throws IOException {
 PutBlockRequestProto.Builder createBlockRequest =
 PutBlockRequestProto.newBuilder()
 .setBlockData(containerBlockData)
 .setEof(eof);
 String id = xceiverClient.getPipeline().getFirstNode().getUuidString();
final String id = pipeline.getFirstNode().getUuidString();
 ContainerCommandRequestProto.Builder builder =
 ContainerCommandRequestProto.newBuilder().setCmdType(Type.PutBlock)
 .setContainerID(containerBlockData.getBlockID().getContainerID())
Expand All@@ -199,8 +208,7 @@ public static XceiverClientReply putBlockAsync(
 if (token != null) {
 builder.setEncodedToken(token.encodeToUrlString());
 }
 ContainerCommandRequestProto request = builder.build();
 return xceiverClient.sendCommandAsync(request);
 return builder.build();
 }

 /**
Expand Down

27 changes: 19 additions & 8 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -427,6 +427,20 @@ private ContainerCommandResponseProto runCommand(
 return dispatchCommand(requestProto, context);
 }

 private CompletableFuture<ContainerCommandResponseProto> runCommandAsync(
 ContainerCommandRequestProto requestProto, LogEntryProto entry) {
 return CompletableFuture.supplyAsync(() -> {
 final DispatcherContext context = new DispatcherContext.Builder()
 .setTerm(entry.getTerm())
 .setLogIndex(entry.getIndex())
 .setStage(DispatcherContext.WriteChunkStage.COMMIT_DATA)
 .setContainer2BCSIDMap(container2BCSIDMap)
 .build();

 return runCommand(requestProto, context);
 }, executor);
 }

 private CompletableFuture<Message> handleWriteChunk(
 ContainerCommandRequestProto requestProto, long entryIndex, long term,
 long startTime) {
Expand DownExpand Up@@ -560,19 +574,16 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 "DataStream: " + stream + " is not closed properly"));
 }

 final CompletableFuture<ContainerCommandResponseProto> f;
 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
f = CompletableFuture.completedFuture(null);
request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return f.whenComplete((res, e) -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("PutBlock {} Term: {} Index: {}",
 res.getResult(), entry.getTerm(), entry.getIndex());
 }
 });
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream. by szetszwo · Pull Request #3229 · apache/ozone · GitHub
Skip to content
HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.#3229

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

Mar 28, 2022
 Merged


HDDS-6500. [Ozone-Streaming] Buffer the PutBlockRequest at the end of the stream.
#3229
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


48 changes: 45 additions & 3 deletions
...p-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.BlockData;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfo;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.KeyValue;
import org.apache.hadoop.hdds.ratis.ContainerCommandRequestMessage;
Expand DownExpand Up@@ -83,6 +84,9 @@
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);

 public static final int PUT_BLOCK_REQUEST_LENGTH_MAX = 1 << 20; // 1MB

 public static final String EXCEPTION_MSG =
 "Unexpected Storage Container Exception: ";
 private static final CompletableFuture[] EMPTY_FUTURE_ARRAY = {};
Expand DownExpand Up@@ -406,12 +410,26 @@ private void executePutBlock(boolean close,
 byteBufferList = null;
 }
 waitFuturesComplete();
 final BlockData blockData = containerBlockData.build();
 if (close) {
 dataStreamCloseReply = out.closeAsync();
 final ContainerCommandRequestProto putBlockRequest
 = ContainerProtocolCalls.getPutBlockRequest(
 xceiverClient.getPipeline(), blockData, true, token);
 dataStreamCloseReply = executePutBlockClose(putBlockRequest,
 PUT_BLOCK_REQUEST_LENGTH_MAX, out);
 dataStreamCloseReply.whenComplete((reply, e) -> {
 if (e != null || reply == null || !reply.isSuccess()) {
 LOG.warn("Failed executePutBlockClose, reply=" + reply, e);
 try {
 executePutBlock(true, false);
 } catch (IOException ex) {
 throw new CompletionException(ex);
 }
 }
 });
Comment thread
ivandika3 marked this conversation as resolved.

 }

 try {
 BlockData blockData = containerBlockData.build();
 XceiverClientReply asyncReply =
 putBlockAsync(xceiverClient, blockData, close, token);
 final CompletableFuture<ContainerCommandResponseProto> flushFuture
Expand DownExpand Up@@ -459,6 +477,30 @@ private void executePutBlock(boolean close,
 }
 }

 public static CompletableFuture<DataStreamReply> executePutBlockClose(
 ContainerCommandRequestProto putBlockRequest, int max,
 DataStreamOutput out) {
 final ByteBuffer putBlock = ContainerCommandRequestMessage.toMessage(
 putBlockRequest, null).getContent().asReadOnlyByteBuffer();
 final ByteBuffer protoLength = getProtoLength(putBlock, max);
 RatisHelper.debug(putBlock, "putBlock", LOG);
 out.writeAsync(putBlock);
 RatisHelper.debug(protoLength, "protoLength", LOG);
 return out.writeAsync(protoLength, StandardWriteOption.CLOSE);
 }

 public static ByteBuffer getProtoLength(ByteBuffer putBlock, int max) {
 final int protoLength = putBlock.remaining();
 Preconditions.checkState(protoLength <= max,
 "protoLength== %s > max = %s", protoLength, max);
 final ByteBuffer buffer = ByteBuffer.allocate(4);
 buffer.putInt(protoLength);
 buffer.flip();
 LOG.debug("protoLength = {}", protoLength);
 Preconditions.checkState(buffer.remaining() == 4);
 return buffer.asReadOnlyBuffer();
 }

 @Override
 public void flush() throws IOException {
 if (xceiverClientFactory != null && xceiverClient != null
Expand DownExpand Up@@ -547,7 +589,7 @@ private void validateResponse(
 }


 private void setIoException(Exception e) {
 private void setIoException(Throwable e) {
 IOException ioe = getIoException();
 if (ioe == null) {
 IOException exception = new IOException(EXCEPTION_MSG + e.toString(), e);
Expand Down

26 changes: 26 additions & 0 deletions
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
package org.apache.hadoop.hdds.ratis;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -58,6 +59,7 @@
import org.apache.ratis.rpc.RpcType;
import org.apache.ratis.rpc.SupportedRpcType;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.io.netty.buffer.ByteBuf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand DownExpand Up@@ -436,4 +438,28 @@ private static <U> Class<? extends U> getClass(String name,
 throw new RuntimeException(e);
 }
 }

 public static void debug(ByteBuffer buffer, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buffer = buffer.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buffer.remaining() > 0; i++) {
 builder.append(buffer.get()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buffer, builder);
 }

 public static void debug(ByteBuf buf, String name, Logger log) {
 if (!log.isDebugEnabled()) {
 return;
 }
 buf = buf.duplicate();
 final StringBuilder builder = new StringBuilder();
 for (int i = 1; buf.readableBytes() > 0; i++) {
 builder.append(buf.readByte()).append(i % 20 == 0 ? "\n " : ", ");
 }
 log.debug("{}: {}\n {}", name, buf, builder);
 }
}

14 changes: 11 additions & 3 deletions
...-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.BlockNotCommittedException;
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerNotOpenException;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.ozone.common.Checksum;
import org.apache.hadoop.ozone.common.ChecksumData;
Expand DownExpand Up@@ -186,11 +187,19 @@ public static XceiverClientReply putBlockAsync(
 XceiverClientSpi xceiverClient, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token)
 throws IOException, InterruptedException, ExecutionException {
 final ContainerCommandRequestProto request = getPutBlockRequest(
 xceiverClient.getPipeline(), containerBlockData, eof, token);
 return xceiverClient.sendCommandAsync(request);
 }

 public static ContainerCommandRequestProto getPutBlockRequest(
 Pipeline pipeline, BlockData containerBlockData, boolean eof,
 Token<? extends TokenIdentifier> token) throws IOException {
 PutBlockRequestProto.Builder createBlockRequest =
 PutBlockRequestProto.newBuilder()
 .setBlockData(containerBlockData)
 .setEof(eof);
 String id = xceiverClient.getPipeline().getFirstNode().getUuidString();
final String id = pipeline.getFirstNode().getUuidString();
 ContainerCommandRequestProto.Builder builder =
 ContainerCommandRequestProto.newBuilder().setCmdType(Type.PutBlock)
 .setContainerID(containerBlockData.getBlockID().getContainerID())
Expand All@@ -199,8 +208,7 @@ public static XceiverClientReply putBlockAsync(
 if (token != null) {
 builder.setEncodedToken(token.encodeToUrlString());
 }
 ContainerCommandRequestProto request = builder.build();
 return xceiverClient.sendCommandAsync(request);
 return builder.build();
 }

 /**
Expand Down

27 changes: 19 additions & 8 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -427,6 +427,20 @@ private ContainerCommandResponseProto runCommand(
 return dispatchCommand(requestProto, context);
 }

 private CompletableFuture<ContainerCommandResponseProto> runCommandAsync(
 ContainerCommandRequestProto requestProto, LogEntryProto entry) {
 return CompletableFuture.supplyAsync(() -> {
 final DispatcherContext context = new DispatcherContext.Builder()
 .setTerm(entry.getTerm())
 .setLogIndex(entry.getIndex())
 .setStage(DispatcherContext.WriteChunkStage.COMMIT_DATA)
 .setContainer2BCSIDMap(container2BCSIDMap)
 .build();

 return runCommand(requestProto, context);
 }, executor);
 }

 private CompletableFuture<Message> handleWriteChunk(
 ContainerCommandRequestProto requestProto, long entryIndex, long term,
 long startTime) {
Expand DownExpand Up@@ -560,19 +574,16 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 "DataStream: " + stream + " is not closed properly"));
 }

 final CompletableFuture<ContainerCommandResponseProto> f;
 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
f = CompletableFuture.completedFuture(null);
request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return f.whenComplete((res, e) -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("PutBlock {} Term: {} Index: {}",
 res.getResult(), entry.getTerm(), entry.getIndex());
 }
 });
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down
Loading