Skip to content

HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput#2603

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
szetszwo merged 8 commits into from
Sep 8, 2021
Merged

HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput #2603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
95e10c5
ByteBufStreamOutput -> ByteBufferStreamOutput
kaijchen Sep 1, 2021
73ab352
Use write(b, off, len) to implement write(b)
kaijchen Sep 1, 2021
de0c64e
fix empty chunk
kaijchen Sep 1, 2021
7bb9ddd
separate tests
kaijchen Sep 1, 2021
9d02448
abstract testWrite(length) method
kaijchen Sep 1, 2021
5cf210b
change param in writeChunkToContainer()
kaijchen Sep 7, 2021
453c47e
fix style
kaijchen Sep 7, 2021
d694e82
update javadoc
kaijchen Sep 7, 2021
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
4 changes: 0 additions & 4 deletions hadoop-hdds/client/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>${spotbugs.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
26 changes: 14 additions & 12 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@@ -20,7 +20,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
Expand All@@ -46,6 +45,7 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand All@@ -59,7 +59,7 @@
import static org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls.putBlockAsync;

/**
* An {@link ByteBufStreamOutput} used by the REST service in combination
* An {@link ByteBufferStreamOutput} used by the REST service in combination
* with the SCMClient to write the value of a key to a sequence
* of container chunks. Writes are buffered locally and periodically written to
* the container as a new chunk. In order to preserve the semantics that
Expand All@@ -74,7 +74,7 @@
* This class encapsulates all state management for buffering and writing
* through to the container.
*/
public class BlockDataStreamOutput implements ByteBufStreamOutput {
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
public static final Logger LOG =
LoggerFactory.getLogger(BlockDataStreamOutput.class);
public static final String EXCEPTION_MSG =
Expand DownExpand Up@@ -209,16 +209,16 @@ public IOException getIoException() {
}

@Override
public void write(ByteBuf buf) throws IOException {
public void write(ByteBuffer b, int off, int len) throws IOException {
checkOpen();
if (buf == null) {
if (b == null) {
throw new NullPointerException();
}
final int len = buf.readableBytes();
if (len == 0) {
return;
}
writeChunkToContainer(buf);
writeChunkToContainer(
(ByteBuffer) b.asReadOnlyBuffer().position(off).limit(off + len));

writtenDataLength += len;
}
Expand DownExpand Up@@ -476,15 +476,17 @@ private boolean needSync(long position) {
* Writes buffered data as a new chunk to the container and saves chunk
* information to be used later in putKey call.
*
* @param buf chunk data to write, from position to limit
* @throws IOException if there is an I/O error while performing the call
* @throws OzoneChecksumException if there is an error while computing
* checksum
*/
private void writeChunkToContainer(ByteBuf buf)
private void writeChunkToContainer(ByteBuffer buf)
throws IOException {
ChecksumData checksumData = checksum.computeChecksum(buf.nioBuffer());
int effectiveChunkSize = buf.readableBytes();
final int effectiveChunkSize = buf.remaining();
final long offset = chunkOffset.getAndAdd(effectiveChunkSize);
ChecksumData checksumData =
checksum.computeChecksum(buf.asReadOnlyBuffer());
ChunkInfo chunkInfo = ChunkInfo.newBuilder()
.setChunkName(blockID.get().getLocalID() + "_chunk_" + ++chunkIndex)
.setOffset(offset)
Expand All@@ -499,8 +501,8 @@ private void writeChunkToContainer(ByteBuf buf)

CompletableFuture<DataStreamReply> future =
(needSync(offset + effectiveChunkSize) ?
out.writeAsync(buf.nioBuffer(), StandardWriteOption.SYNC) :
out.writeAsync(buf.nioBuffer()))
out.writeAsync(buf, StandardWriteOption.SYNC) :
out.writeAsync(buf))
.whenCompleteAsync((r, e) -> {
if (e != null || !r.isSuccess()) {
if (e == null) {
Expand Down
15 changes: 7 additions & 8 deletions ...hdds/scm/storage/ByteBufStreamOutput.java → ...s/scm/storage/ByteBufferStreamOutput.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,24 @@

package org.apache.hadoop.hdds.scm.storage;

import io.netty.buffer.ByteBuf;

import java.io.Closeable;
import java.io.IOException;
import java.nio.ByteBuffer;

/**
* This interface is for writing an output stream of ByteBuffers.
* An ByteBufStreamOutput accepts Netty ByteBuf and sends them to some sink.
* An ByteBufferStreamOutput accepts nio ByteBuffer and sends them to some sink.
*/
public interface ByteBufStreamOutput extends Closeable {
public interface ByteBufferStreamOutput extends Closeable {
/**
* Try to write all the bytes in ByteBuf b to DataStream.
*
* @param b the data.
* @exception IOException if an I/O error occurs.
*/
void write(ByteBuf b) throws IOException;
default void write(ByteBuffer b) throws IOException {
write(b, b.position(), b.remaining());
}

/**
* Try to write the [off:off + len) slice in ByteBuf b to DataStream.
Expand All@@ -44,9 +45,7 @@ public interface ByteBufStreamOutput extends Closeable {
* @param len the number of bytes to write.
* @exception IOException if an I/O error occurs.
*/
default void write(ByteBuf b, int off, int len) throws IOException {
write(b.slice(off, len));
}
void write(ByteBuffer b, int off, int len) throws IOException;

/**
* Flushes this DataStream output and forces any buffered output bytes
Expand Down
51 changes: 25 additions & 26 deletions ...ne/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockDataStreamOutputEntry.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,29 +18,29 @@
package org.apache.hadoop.ozone.client.io;

import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
import org.apache.hadoop.hdds.scm.XceiverClientFactory;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.storage.BlockDataStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.security.token.Token;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Collections;

/**
* Helper class used inside {@link BlockDataStreamOutput}.
* */
public final class BlockDataStreamOutputEntry
implements ByteBufStreamOutput {
implements ByteBufferStreamOutput {

private final OzoneClientConfig config;
private ByteBufStreamOutput byteBufStreamOutput;
private ByteBufferStreamOutput byteBufferStreamOutput;
private BlockID blockID;
private final String key;
private final XceiverClientFactory xceiverClientManager;
Expand All@@ -61,7 +61,7 @@ private BlockDataStreamOutputEntry(
OzoneClientConfig config
) {
this.config = config;
this.byteBufStreamOutput = null;
this.byteBufferStreamOutput = null;
this.blockID = blockID;
this.key = key;
this.xceiverClientManager = xceiverClientManager;
Expand DownExpand Up@@ -90,63 +90,62 @@ long getRemaining() {
* @throws IOException if xceiverClient initialization fails
*/
private void checkStream() throws IOException {
if (this.byteBufStreamOutput == null) {
this.byteBufStreamOutput =
if (this.byteBufferStreamOutput == null) {
this.byteBufferStreamOutput =
new BlockDataStreamOutput(blockID, xceiverClientManager,
pipeline, config, token);
}
}

@Override
public void write(ByteBuf b) throws IOException {
public void write(ByteBuffer b, int off, int len) throws IOException {
checkStream();
final int len = b.readableBytes();
byteBufStreamOutput.write(b);
byteBufferStreamOutput.write(b, off, len);
this.currentPosition += len;
}

@Override
public void flush() throws IOException {
if (this.byteBufStreamOutput != null) {
this.byteBufStreamOutput.flush();
if (this.byteBufferStreamOutput != null) {
this.byteBufferStreamOutput.flush();
}
}

@Override
public void close() throws IOException {
if (this.byteBufStreamOutput != null) {
this.byteBufStreamOutput.close();
if (this.byteBufferStreamOutput != null) {
this.byteBufferStreamOutput.close();
// after closing the chunkOutPutStream, blockId would have been
// reconstructed with updated bcsId
this.blockID =
((BlockDataStreamOutput) byteBufStreamOutput).getBlockID();
((BlockDataStreamOutput) byteBufferStreamOutput).getBlockID();
}
}

boolean isClosed() {
if (byteBufStreamOutput != null) {
return ((BlockDataStreamOutput) byteBufStreamOutput).isClosed();
if (byteBufferStreamOutput != null) {
return ((BlockDataStreamOutput) byteBufferStreamOutput).isClosed();
}
return false;
}

Collection<DatanodeDetails> getFailedServers() {
if (byteBufStreamOutput != null) {
if (byteBufferStreamOutput != null) {
BlockDataStreamOutput out =
(BlockDataStreamOutput) this.byteBufStreamOutput;
(BlockDataStreamOutput) this.byteBufferStreamOutput;
return out.getFailedServers();
}
return Collections.emptyList();
}

long getWrittenDataLength() {
if (byteBufStreamOutput != null) {
if (byteBufferStreamOutput != null) {
BlockDataStreamOutput out =
(BlockDataStreamOutput) this.byteBufStreamOutput;
(BlockDataStreamOutput) this.byteBufferStreamOutput;
return out.getWrittenDataLength();
} else {
// For a pre allocated block for which no write has been initiated,
// the ByteBufStreamOutput will be null here.
// the ByteBufferStreamOutput will be null here.
// In such cases, the default blockCommitSequenceId will be 0
return 0;
}
Expand All@@ -155,15 +154,15 @@ long getWrittenDataLength() {
void cleanup(boolean invalidateClient) throws IOException {
checkStream();
BlockDataStreamOutput out =
(BlockDataStreamOutput) this.byteBufStreamOutput;
(BlockDataStreamOutput) this.byteBufferStreamOutput;
out.cleanup(invalidateClient);

}

void writeOnRetry(long len) throws IOException {
checkStream();
BlockDataStreamOutput out =
(BlockDataStreamOutput) this.byteBufStreamOutput;
(BlockDataStreamOutput) this.byteBufferStreamOutput;
out.writeOnRetry(len);
this.currentPosition += len;

Expand DownExpand Up@@ -231,8 +230,8 @@ public BlockDataStreamOutputEntry build() {
}

@VisibleForTesting
public ByteBufStreamOutput getByteBufStreamOutput() {
return byteBufStreamOutput;
public ByteBufferStreamOutput getByteBufStreamOutput() {
return byteBufferStreamOutput;
}

public BlockID getBlockID() {
Expand Down
15 changes: 7 additions & 8 deletions hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyDataStreamOutput.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.fs.FSExceptionMessages;
import org.apache.hadoop.fs.FileEncryptionInfo;
import org.apache.hadoop.hdds.client.ReplicationConfig;
Expand All@@ -32,7 +31,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.io.retry.RetryPolicies;
import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
Expand All@@ -48,6 +47,7 @@

import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand All@@ -63,7 +63,7 @@
*
* TODO : currently not support multi-thread access.
*/
public class KeyDataStreamOutput implements ByteBufStreamOutput {
public class KeyDataStreamOutput implements ByteBufferStreamOutput {

private OzoneClientConfig config;

Expand DownExpand Up@@ -185,17 +185,16 @@ public void addPreallocateBlocks(OmKeyLocationInfoGroup version,
}

@Override
public void write(ByteBuf b) throws IOException {
public void write(ByteBuffer b, int off, int len) throws IOException {
checkNotClosed();
if (b == null) {
throw new NullPointerException();
}
final int len = b.readableBytes();
handleWrite(b, b.readerIndex(), len, false);
handleWrite(b, off, len, false);
writeOffset += len;
}

private void handleWrite(ByteBuf b, int off, long len, boolean retry)
private void handleWrite(ByteBuffer b, int off, long len, boolean retry)
throws IOException {
while (len > 0) {
try {
Expand DownExpand Up@@ -227,7 +226,7 @@ private void handleWrite(ByteBuf b, int off, long len, boolean retry)
}

private int writeToDataStreamOutput(BlockDataStreamOutputEntry current,
boolean retry, long len, ByteBuf b, int writeLen, int off,
boolean retry, long len, ByteBuffer b, int writeLen, int off,
long currentPos) throws IOException {
try {
if (retry) {
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-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput by kaijchen · Pull Request #2603 · apache/ozone · GitHub
Skip to content
HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput#2603

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

szetszwo
merged 8 commits into

from

Sep 8, 2021
 Merged


HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput
#2603
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
95e10c5

ByteBufStreamOutput -> ByteBufferStreamOutput


kaijchen Sep 1, 2021
73ab352

Use write(b, off, len) to implement write(b)


kaijchen Sep 1, 2021
de0c64e

fix empty chunk


kaijchen Sep 1, 2021
7bb9ddd

separate tests


kaijchen Sep 1, 2021
9d02448

abstract testWrite(length) method


kaijchen Sep 1, 2021
5cf210b

change param in writeChunkToContainer()


kaijchen Sep 7, 2021
453c47e

fix style


kaijchen Sep 7, 2021
d694e82

update javadoc


kaijchen Sep 7, 2021

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


4 changes: 0 additions & 4 deletions
hadoop-hdds/client/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 <version>${spotbugs.version}</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>io.netty</groupId>
 <artifactId>netty-buffer</artifactId>
 </dependency>
 </dependencies>

 <build>
Expand Down

26 changes: 14 additions & 12 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@@ -20,7 +20,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
Expand All@@ -46,6 +45,7 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand All@@ -59,7 +59,7 @@
import static org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls.putBlockAsync;

/**
 * An {@link ByteBufStreamOutput} used by the REST service in combination
 * An {@link ByteBufferStreamOutput} used by the REST service in combination
 * with the SCMClient to write the value of a key to a sequence
 * of container chunks. Writes are buffered locally and periodically written to
 * the container as a new chunk. In order to preserve the semantics that
Expand All@@ -74,7 +74,7 @@
 * This class encapsulates all state management for buffering and writing
 * through to the container.
 */
public class BlockDataStreamOutput implements ByteBufStreamOutput {
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);
 public static final String EXCEPTION_MSG =
Expand DownExpand Up@@ -209,16 +209,16 @@ public IOException getIoException() {
 }

 @Override
 public void write(ByteBuf buf) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkOpen();
 if (buf == null) {
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = buf.readableBytes();
 if (len == 0) {
 return;
 }
 writeChunkToContainer(buf);
 writeChunkToContainer(
 (ByteBuffer) b.asReadOnlyBuffer().position(off).limit(off + len));

 writtenDataLength += len;
 }
Expand DownExpand Up@@ -476,15 +476,17 @@ private boolean needSync(long position) {
 * Writes buffered data as a new chunk to the container and saves chunk
 * information to be used later in putKey call.
 *
 * @param buf chunk data to write, from position to limit
 * @throws IOException if there is an I/O error while performing the call
 * @throws OzoneChecksumException if there is an error while computing
 * checksum
 */
 private void writeChunkToContainer(ByteBuf buf)
 private void writeChunkToContainer(ByteBuffer buf)
 throws IOException {
 ChecksumData checksumData = checksum.computeChecksum(buf.nioBuffer());
 int effectiveChunkSize = buf.readableBytes();
 final int effectiveChunkSize = buf.remaining();
 final long offset = chunkOffset.getAndAdd(effectiveChunkSize);
 ChecksumData checksumData =
 checksum.computeChecksum(buf.asReadOnlyBuffer());
 ChunkInfo chunkInfo = ChunkInfo.newBuilder()
 .setChunkName(blockID.get().getLocalID() + "_chunk_" + ++chunkIndex)
 .setOffset(offset)
Expand All@@ -499,8 +501,8 @@ private void writeChunkToContainer(ByteBuf buf)

 CompletableFuture<DataStreamReply> future =
 (needSync(offset + effectiveChunkSize) ?
 out.writeAsync(buf.nioBuffer(), StandardWriteOption.SYNC) :
 out.writeAsync(buf.nioBuffer()))
 out.writeAsync(buf, StandardWriteOption.SYNC) :
 out.writeAsync(buf))
 .whenCompleteAsync((r, e) -> {
 if (e != null || !r.isSuccess()) {
 if (e == null) {
Expand Down

15 changes: 7 additions & 8 deletions
...hdds/scm/storage/ByteBufStreamOutput.java → ...s/scm/storage/ByteBufferStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,24 @@

package org.apache.hadoop.hdds.scm.storage;

import io.netty.buffer.ByteBuf;

import java.io.Closeable;
import java.io.IOException;
import java.nio.ByteBuffer;

/**
* This interface is for writing an output stream of ByteBuffers.
* An ByteBufStreamOutput accepts Netty ByteBuf and sends them to some sink.
* An ByteBufferStreamOutput accepts nio ByteBuffer and sends them to some sink.
*/
public interface ByteBufStreamOutput extends Closeable {
public interface ByteBufferStreamOutput extends Closeable {
 /**
 * Try to write all the bytes in ByteBuf b to DataStream.
 *
 * @param b the data.
 * @exception IOException if an I/O error occurs.
 */
 void write(ByteBuf b) throws IOException;
 default void write(ByteBuffer b) throws IOException {
 write(b, b.position(), b.remaining());
 }

 /**
 * Try to write the [off:off + len) slice in ByteBuf b to DataStream.
Expand All@@ -44,9 +45,7 @@ public interface ByteBufStreamOutput extends Closeable {
 * @param len the number of bytes to write.
 * @exception IOException if an I/O error occurs.
 */
 default void write(ByteBuf b, int off, int len) throws IOException {
 write(b.slice(off, len));
 }
 void write(ByteBuffer b, int off, int len) throws IOException;

 /**
 * Flushes this DataStream output and forces any buffered output bytes
Expand Down

51 changes: 25 additions & 26 deletions
...ne/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockDataStreamOutputEntry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,29 +18,29 @@
package org.apache.hadoop.ozone.client.io;

import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
import org.apache.hadoop.hdds.scm.XceiverClientFactory;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.storage.BlockDataStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.security.token.Token;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Collections;

/**
 * Helper class used inside {@link BlockDataStreamOutput}.
 * */
public final class BlockDataStreamOutputEntry
 implements ByteBufStreamOutput {
 implements ByteBufferStreamOutput {

 private final OzoneClientConfig config;
 private ByteBufStreamOutput byteBufStreamOutput;
 private ByteBufferStreamOutput byteBufferStreamOutput;
 private BlockID blockID;
 private final String key;
 private final XceiverClientFactory xceiverClientManager;
Expand All@@ -61,7 +61,7 @@ private BlockDataStreamOutputEntry(
 OzoneClientConfig config
 ) {
 this.config = config;
 this.byteBufStreamOutput = null;
 this.byteBufferStreamOutput = null;
 this.blockID = blockID;
 this.key = key;
 this.xceiverClientManager = xceiverClientManager;
Expand DownExpand Up@@ -90,63 +90,62 @@ long getRemaining() {
 * @throws IOException if xceiverClient initialization fails
 */
 private void checkStream() throws IOException {
 if (this.byteBufStreamOutput == null) {
 this.byteBufStreamOutput =
 if (this.byteBufferStreamOutput == null) {
 this.byteBufferStreamOutput =
 new BlockDataStreamOutput(blockID, xceiverClientManager,
 pipeline, config, token);
 }
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkStream();
 final int len = b.readableBytes();
 byteBufStreamOutput.write(b);
 byteBufferStreamOutput.write(b, off, len);
 this.currentPosition += len;
 }

 @Override
 public void flush() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.flush();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.flush();
 }
 }

 @Override
 public void close() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.close();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.close();
 // after closing the chunkOutPutStream, blockId would have been
 // reconstructed with updated bcsId
 this.blockID =
 ((BlockDataStreamOutput) byteBufStreamOutput).getBlockID();
 ((BlockDataStreamOutput) byteBufferStreamOutput).getBlockID();
 }
 }

 boolean isClosed() {
 if (byteBufStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufStreamOutput).isClosed();
 if (byteBufferStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufferStreamOutput).isClosed();
 }
 return false;
 }

 Collection<DatanodeDetails> getFailedServers() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getFailedServers();
 }
 return Collections.emptyList();
 }

 long getWrittenDataLength() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getWrittenDataLength();
 } else {
 // For a pre allocated block for which no write has been initiated,
 // the ByteBufStreamOutput will be null here.
 // the ByteBufferStreamOutput will be null here.
 // In such cases, the default blockCommitSequenceId will be 0
 return 0;
 }
Expand All@@ -155,15 +154,15 @@ long getWrittenDataLength() {
 void cleanup(boolean invalidateClient) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.cleanup(invalidateClient);

 }

 void writeOnRetry(long len) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.writeOnRetry(len);
 this.currentPosition += len;

Expand DownExpand Up@@ -231,8 +230,8 @@ public BlockDataStreamOutputEntry build() {
 }

 @VisibleForTesting
 public ByteBufStreamOutput getByteBufStreamOutput() {
 return byteBufStreamOutput;
 public ByteBufferStreamOutput getByteBufStreamOutput() {
 return byteBufferStreamOutput;
 }

 public BlockID getBlockID() {
Expand Down

15 changes: 7 additions & 8 deletions
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.fs.FSExceptionMessages;
import org.apache.hadoop.fs.FileEncryptionInfo;
import org.apache.hadoop.hdds.client.ReplicationConfig;
Expand All@@ -32,7 +31,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.io.retry.RetryPolicies;
import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
Expand All@@ -48,6 +47,7 @@

import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand All@@ -63,7 +63,7 @@
 *
 * TODO : currently not support multi-thread access.
 */
public class KeyDataStreamOutput implements ByteBufStreamOutput {
public class KeyDataStreamOutput implements ByteBufferStreamOutput {

 private OzoneClientConfig config;

Expand DownExpand Up@@ -185,17 +185,16 @@ public void addPreallocateBlocks(OmKeyLocationInfoGroup version,
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkNotClosed();
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = b.readableBytes();
 handleWrite(b, b.readerIndex(), len, false);
 handleWrite(b, off, len, false);
 writeOffset += len;
 }

 private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 private void handleWrite(ByteBuffer b, int off, long len, boolean retry)
 throws IOException {
 while (len > 0) {
 try {
Expand DownExpand Up@@ -227,7 +226,7 @@ private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 }

 private int writeToDataStreamOutput(BlockDataStreamOutputEntry current,
 boolean retry, long len, ByteBuf b, int writeLen, int off,
 boolean retry, long len, ByteBuffer b, int writeLen, int off,
 long currentPos) throws IOException {
 try {
 if (retry) {
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-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput by kaijchen · Pull Request #2603 · apache/ozone · GitHub
Skip to content
HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput#2603

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

szetszwo
merged 8 commits into

from

Sep 8, 2021
 Merged


HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput
#2603
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
95e10c5

ByteBufStreamOutput -> ByteBufferStreamOutput


kaijchen Sep 1, 2021
73ab352

Use write(b, off, len) to implement write(b)


kaijchen Sep 1, 2021
de0c64e

fix empty chunk


kaijchen Sep 1, 2021
7bb9ddd

separate tests


kaijchen Sep 1, 2021
9d02448

abstract testWrite(length) method


kaijchen Sep 1, 2021
5cf210b

change param in writeChunkToContainer()


kaijchen Sep 7, 2021
453c47e

fix style


kaijchen Sep 7, 2021
d694e82

update javadoc


kaijchen Sep 7, 2021

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


4 changes: 0 additions & 4 deletions
hadoop-hdds/client/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 <version>${spotbugs.version}</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>io.netty</groupId>
 <artifactId>netty-buffer</artifactId>
 </dependency>
 </dependencies>

 <build>
Expand Down

26 changes: 14 additions & 12 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@@ -20,7 +20,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
Expand All@@ -46,6 +45,7 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand All@@ -59,7 +59,7 @@
import static org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls.putBlockAsync;

/**
 * An {@link ByteBufStreamOutput} used by the REST service in combination
 * An {@link ByteBufferStreamOutput} used by the REST service in combination
 * with the SCMClient to write the value of a key to a sequence
 * of container chunks. Writes are buffered locally and periodically written to
 * the container as a new chunk. In order to preserve the semantics that
Expand All@@ -74,7 +74,7 @@
 * This class encapsulates all state management for buffering and writing
 * through to the container.
 */
public class BlockDataStreamOutput implements ByteBufStreamOutput {
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);
 public static final String EXCEPTION_MSG =
Expand DownExpand Up@@ -209,16 +209,16 @@ public IOException getIoException() {
 }

 @Override
 public void write(ByteBuf buf) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkOpen();
 if (buf == null) {
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = buf.readableBytes();
 if (len == 0) {
 return;
 }
 writeChunkToContainer(buf);
 writeChunkToContainer(
 (ByteBuffer) b.asReadOnlyBuffer().position(off).limit(off + len));

 writtenDataLength += len;
 }
Expand DownExpand Up@@ -476,15 +476,17 @@ private boolean needSync(long position) {
 * Writes buffered data as a new chunk to the container and saves chunk
 * information to be used later in putKey call.
 *
 * @param buf chunk data to write, from position to limit
 * @throws IOException if there is an I/O error while performing the call
 * @throws OzoneChecksumException if there is an error while computing
 * checksum
 */
 private void writeChunkToContainer(ByteBuf buf)
 private void writeChunkToContainer(ByteBuffer buf)
 throws IOException {
 ChecksumData checksumData = checksum.computeChecksum(buf.nioBuffer());
 int effectiveChunkSize = buf.readableBytes();
 final int effectiveChunkSize = buf.remaining();
 final long offset = chunkOffset.getAndAdd(effectiveChunkSize);
 ChecksumData checksumData =
 checksum.computeChecksum(buf.asReadOnlyBuffer());
 ChunkInfo chunkInfo = ChunkInfo.newBuilder()
 .setChunkName(blockID.get().getLocalID() + "_chunk_" + ++chunkIndex)
 .setOffset(offset)
Expand All@@ -499,8 +501,8 @@ private void writeChunkToContainer(ByteBuf buf)

 CompletableFuture<DataStreamReply> future =
 (needSync(offset + effectiveChunkSize) ?
 out.writeAsync(buf.nioBuffer(), StandardWriteOption.SYNC) :
 out.writeAsync(buf.nioBuffer()))
 out.writeAsync(buf, StandardWriteOption.SYNC) :
 out.writeAsync(buf))
 .whenCompleteAsync((r, e) -> {
 if (e != null || !r.isSuccess()) {
 if (e == null) {
Expand Down

15 changes: 7 additions & 8 deletions
...hdds/scm/storage/ByteBufStreamOutput.java → ...s/scm/storage/ByteBufferStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,24 @@

package org.apache.hadoop.hdds.scm.storage;

import io.netty.buffer.ByteBuf;

import java.io.Closeable;
import java.io.IOException;
import java.nio.ByteBuffer;

/**
* This interface is for writing an output stream of ByteBuffers.
* An ByteBufStreamOutput accepts Netty ByteBuf and sends them to some sink.
* An ByteBufferStreamOutput accepts nio ByteBuffer and sends them to some sink.
*/
public interface ByteBufStreamOutput extends Closeable {
public interface ByteBufferStreamOutput extends Closeable {
 /**
 * Try to write all the bytes in ByteBuf b to DataStream.
 *
 * @param b the data.
 * @exception IOException if an I/O error occurs.
 */
 void write(ByteBuf b) throws IOException;
 default void write(ByteBuffer b) throws IOException {
 write(b, b.position(), b.remaining());
 }

 /**
 * Try to write the [off:off + len) slice in ByteBuf b to DataStream.
Expand All@@ -44,9 +45,7 @@ public interface ByteBufStreamOutput extends Closeable {
 * @param len the number of bytes to write.
 * @exception IOException if an I/O error occurs.
 */
 default void write(ByteBuf b, int off, int len) throws IOException {
 write(b.slice(off, len));
 }
 void write(ByteBuffer b, int off, int len) throws IOException;

 /**
 * Flushes this DataStream output and forces any buffered output bytes
Expand Down

51 changes: 25 additions & 26 deletions
...ne/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockDataStreamOutputEntry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,29 +18,29 @@
package org.apache.hadoop.ozone.client.io;

import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
import org.apache.hadoop.hdds.scm.XceiverClientFactory;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.storage.BlockDataStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.security.token.Token;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Collections;

/**
 * Helper class used inside {@link BlockDataStreamOutput}.
 * */
public final class BlockDataStreamOutputEntry
 implements ByteBufStreamOutput {
 implements ByteBufferStreamOutput {

 private final OzoneClientConfig config;
 private ByteBufStreamOutput byteBufStreamOutput;
 private ByteBufferStreamOutput byteBufferStreamOutput;
 private BlockID blockID;
 private final String key;
 private final XceiverClientFactory xceiverClientManager;
Expand All@@ -61,7 +61,7 @@ private BlockDataStreamOutputEntry(
 OzoneClientConfig config
 ) {
 this.config = config;
 this.byteBufStreamOutput = null;
 this.byteBufferStreamOutput = null;
 this.blockID = blockID;
 this.key = key;
 this.xceiverClientManager = xceiverClientManager;
Expand DownExpand Up@@ -90,63 +90,62 @@ long getRemaining() {
 * @throws IOException if xceiverClient initialization fails
 */
 private void checkStream() throws IOException {
 if (this.byteBufStreamOutput == null) {
 this.byteBufStreamOutput =
 if (this.byteBufferStreamOutput == null) {
 this.byteBufferStreamOutput =
 new BlockDataStreamOutput(blockID, xceiverClientManager,
 pipeline, config, token);
 }
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkStream();
 final int len = b.readableBytes();
 byteBufStreamOutput.write(b);
 byteBufferStreamOutput.write(b, off, len);
 this.currentPosition += len;
 }

 @Override
 public void flush() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.flush();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.flush();
 }
 }

 @Override
 public void close() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.close();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.close();
 // after closing the chunkOutPutStream, blockId would have been
 // reconstructed with updated bcsId
 this.blockID =
 ((BlockDataStreamOutput) byteBufStreamOutput).getBlockID();
 ((BlockDataStreamOutput) byteBufferStreamOutput).getBlockID();
 }
 }

 boolean isClosed() {
 if (byteBufStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufStreamOutput).isClosed();
 if (byteBufferStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufferStreamOutput).isClosed();
 }
 return false;
 }

 Collection<DatanodeDetails> getFailedServers() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getFailedServers();
 }
 return Collections.emptyList();
 }

 long getWrittenDataLength() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getWrittenDataLength();
 } else {
 // For a pre allocated block for which no write has been initiated,
 // the ByteBufStreamOutput will be null here.
 // the ByteBufferStreamOutput will be null here.
 // In such cases, the default blockCommitSequenceId will be 0
 return 0;
 }
Expand All@@ -155,15 +154,15 @@ long getWrittenDataLength() {
 void cleanup(boolean invalidateClient) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.cleanup(invalidateClient);

 }

 void writeOnRetry(long len) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.writeOnRetry(len);
 this.currentPosition += len;

Expand DownExpand Up@@ -231,8 +230,8 @@ public BlockDataStreamOutputEntry build() {
 }

 @VisibleForTesting
 public ByteBufStreamOutput getByteBufStreamOutput() {
 return byteBufStreamOutput;
 public ByteBufferStreamOutput getByteBufStreamOutput() {
 return byteBufferStreamOutput;
 }

 public BlockID getBlockID() {
Expand Down

15 changes: 7 additions & 8 deletions
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.fs.FSExceptionMessages;
import org.apache.hadoop.fs.FileEncryptionInfo;
import org.apache.hadoop.hdds.client.ReplicationConfig;
Expand All@@ -32,7 +31,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.io.retry.RetryPolicies;
import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
Expand All@@ -48,6 +47,7 @@

import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand All@@ -63,7 +63,7 @@
 *
 * TODO : currently not support multi-thread access.
 */
public class KeyDataStreamOutput implements ByteBufStreamOutput {
public class KeyDataStreamOutput implements ByteBufferStreamOutput {

 private OzoneClientConfig config;

Expand DownExpand Up@@ -185,17 +185,16 @@ public void addPreallocateBlocks(OmKeyLocationInfoGroup version,
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkNotClosed();
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = b.readableBytes();
 handleWrite(b, b.readerIndex(), len, false);
 handleWrite(b, off, len, false);
 writeOffset += len;
 }

 private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 private void handleWrite(ByteBuffer b, int off, long len, boolean retry)
 throws IOException {
 while (len > 0) {
 try {
Expand DownExpand Up@@ -227,7 +226,7 @@ private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 }

 private int writeToDataStreamOutput(BlockDataStreamOutputEntry current,
 boolean retry, long len, ByteBuf b, int writeLen, int off,
 boolean retry, long len, ByteBuffer b, int writeLen, int off,
 long currentPos) throws IOException {
 try {
 if (retry) {
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-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput by kaijchen · Pull Request #2603 · apache/ozone · GitHub
Skip to content
HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput#2603

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

szetszwo
merged 8 commits into

from

Sep 8, 2021
 Merged


HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput
#2603
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
95e10c5

ByteBufStreamOutput -> ByteBufferStreamOutput


kaijchen Sep 1, 2021
73ab352

Use write(b, off, len) to implement write(b)


kaijchen Sep 1, 2021
de0c64e

fix empty chunk


kaijchen Sep 1, 2021
7bb9ddd

separate tests


kaijchen Sep 1, 2021
9d02448

abstract testWrite(length) method


kaijchen Sep 1, 2021
5cf210b

change param in writeChunkToContainer()


kaijchen Sep 7, 2021
453c47e

fix style


kaijchen Sep 7, 2021
d694e82

update javadoc


kaijchen Sep 7, 2021

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


4 changes: 0 additions & 4 deletions
hadoop-hdds/client/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 <version>${spotbugs.version}</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>io.netty</groupId>
 <artifactId>netty-buffer</artifactId>
 </dependency>
 </dependencies>

 <build>
Expand Down

26 changes: 14 additions & 12 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@@ -20,7 +20,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
Expand All@@ -46,6 +45,7 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand All@@ -59,7 +59,7 @@
import static org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls.putBlockAsync;

/**
 * An {@link ByteBufStreamOutput} used by the REST service in combination
 * An {@link ByteBufferStreamOutput} used by the REST service in combination
 * with the SCMClient to write the value of a key to a sequence
 * of container chunks. Writes are buffered locally and periodically written to
 * the container as a new chunk. In order to preserve the semantics that
Expand All@@ -74,7 +74,7 @@
 * This class encapsulates all state management for buffering and writing
 * through to the container.
 */
public class BlockDataStreamOutput implements ByteBufStreamOutput {
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);
 public static final String EXCEPTION_MSG =
Expand DownExpand Up@@ -209,16 +209,16 @@ public IOException getIoException() {
 }

 @Override
 public void write(ByteBuf buf) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkOpen();
 if (buf == null) {
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = buf.readableBytes();
 if (len == 0) {
 return;
 }
 writeChunkToContainer(buf);
 writeChunkToContainer(
 (ByteBuffer) b.asReadOnlyBuffer().position(off).limit(off + len));

 writtenDataLength += len;
 }
Expand DownExpand Up@@ -476,15 +476,17 @@ private boolean needSync(long position) {
 * Writes buffered data as a new chunk to the container and saves chunk
 * information to be used later in putKey call.
 *
 * @param buf chunk data to write, from position to limit
 * @throws IOException if there is an I/O error while performing the call
 * @throws OzoneChecksumException if there is an error while computing
 * checksum
 */
 private void writeChunkToContainer(ByteBuf buf)
 private void writeChunkToContainer(ByteBuffer buf)
 throws IOException {
 ChecksumData checksumData = checksum.computeChecksum(buf.nioBuffer());
 int effectiveChunkSize = buf.readableBytes();
 final int effectiveChunkSize = buf.remaining();
 final long offset = chunkOffset.getAndAdd(effectiveChunkSize);
 ChecksumData checksumData =
 checksum.computeChecksum(buf.asReadOnlyBuffer());
 ChunkInfo chunkInfo = ChunkInfo.newBuilder()
 .setChunkName(blockID.get().getLocalID() + "_chunk_" + ++chunkIndex)
 .setOffset(offset)
Expand All@@ -499,8 +501,8 @@ private void writeChunkToContainer(ByteBuf buf)

 CompletableFuture<DataStreamReply> future =
 (needSync(offset + effectiveChunkSize) ?
 out.writeAsync(buf.nioBuffer(), StandardWriteOption.SYNC) :
 out.writeAsync(buf.nioBuffer()))
 out.writeAsync(buf, StandardWriteOption.SYNC) :
 out.writeAsync(buf))
 .whenCompleteAsync((r, e) -> {
 if (e != null || !r.isSuccess()) {
 if (e == null) {
Expand Down

15 changes: 7 additions & 8 deletions
...hdds/scm/storage/ByteBufStreamOutput.java → ...s/scm/storage/ByteBufferStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,24 @@

package org.apache.hadoop.hdds.scm.storage;

import io.netty.buffer.ByteBuf;

import java.io.Closeable;
import java.io.IOException;
import java.nio.ByteBuffer;

/**
* This interface is for writing an output stream of ByteBuffers.
* An ByteBufStreamOutput accepts Netty ByteBuf and sends them to some sink.
* An ByteBufferStreamOutput accepts nio ByteBuffer and sends them to some sink.
*/
public interface ByteBufStreamOutput extends Closeable {
public interface ByteBufferStreamOutput extends Closeable {
 /**
 * Try to write all the bytes in ByteBuf b to DataStream.
 *
 * @param b the data.
 * @exception IOException if an I/O error occurs.
 */
 void write(ByteBuf b) throws IOException;
 default void write(ByteBuffer b) throws IOException {
 write(b, b.position(), b.remaining());
 }

 /**
 * Try to write the [off:off + len) slice in ByteBuf b to DataStream.
Expand All@@ -44,9 +45,7 @@ public interface ByteBufStreamOutput extends Closeable {
 * @param len the number of bytes to write.
 * @exception IOException if an I/O error occurs.
 */
 default void write(ByteBuf b, int off, int len) throws IOException {
 write(b.slice(off, len));
 }
 void write(ByteBuffer b, int off, int len) throws IOException;

 /**
 * Flushes this DataStream output and forces any buffered output bytes
Expand Down

51 changes: 25 additions & 26 deletions
...ne/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockDataStreamOutputEntry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,29 +18,29 @@
package org.apache.hadoop.ozone.client.io;

import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
import org.apache.hadoop.hdds.scm.XceiverClientFactory;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.storage.BlockDataStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.security.token.Token;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Collections;

/**
 * Helper class used inside {@link BlockDataStreamOutput}.
 * */
public final class BlockDataStreamOutputEntry
 implements ByteBufStreamOutput {
 implements ByteBufferStreamOutput {

 private final OzoneClientConfig config;
 private ByteBufStreamOutput byteBufStreamOutput;
 private ByteBufferStreamOutput byteBufferStreamOutput;
 private BlockID blockID;
 private final String key;
 private final XceiverClientFactory xceiverClientManager;
Expand All@@ -61,7 +61,7 @@ private BlockDataStreamOutputEntry(
 OzoneClientConfig config
 ) {
 this.config = config;
 this.byteBufStreamOutput = null;
 this.byteBufferStreamOutput = null;
 this.blockID = blockID;
 this.key = key;
 this.xceiverClientManager = xceiverClientManager;
Expand DownExpand Up@@ -90,63 +90,62 @@ long getRemaining() {
 * @throws IOException if xceiverClient initialization fails
 */
 private void checkStream() throws IOException {
 if (this.byteBufStreamOutput == null) {
 this.byteBufStreamOutput =
 if (this.byteBufferStreamOutput == null) {
 this.byteBufferStreamOutput =
 new BlockDataStreamOutput(blockID, xceiverClientManager,
 pipeline, config, token);
 }
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkStream();
 final int len = b.readableBytes();
 byteBufStreamOutput.write(b);
 byteBufferStreamOutput.write(b, off, len);
 this.currentPosition += len;
 }

 @Override
 public void flush() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.flush();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.flush();
 }
 }

 @Override
 public void close() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.close();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.close();
 // after closing the chunkOutPutStream, blockId would have been
 // reconstructed with updated bcsId
 this.blockID =
 ((BlockDataStreamOutput) byteBufStreamOutput).getBlockID();
 ((BlockDataStreamOutput) byteBufferStreamOutput).getBlockID();
 }
 }

 boolean isClosed() {
 if (byteBufStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufStreamOutput).isClosed();
 if (byteBufferStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufferStreamOutput).isClosed();
 }
 return false;
 }

 Collection<DatanodeDetails> getFailedServers() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getFailedServers();
 }
 return Collections.emptyList();
 }

 long getWrittenDataLength() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getWrittenDataLength();
 } else {
 // For a pre allocated block for which no write has been initiated,
 // the ByteBufStreamOutput will be null here.
 // the ByteBufferStreamOutput will be null here.
 // In such cases, the default blockCommitSequenceId will be 0
 return 0;
 }
Expand All@@ -155,15 +154,15 @@ long getWrittenDataLength() {
 void cleanup(boolean invalidateClient) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.cleanup(invalidateClient);

 }

 void writeOnRetry(long len) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.writeOnRetry(len);
 this.currentPosition += len;

Expand DownExpand Up@@ -231,8 +230,8 @@ public BlockDataStreamOutputEntry build() {
 }

 @VisibleForTesting
 public ByteBufStreamOutput getByteBufStreamOutput() {
 return byteBufStreamOutput;
 public ByteBufferStreamOutput getByteBufStreamOutput() {
 return byteBufferStreamOutput;
 }

 public BlockID getBlockID() {
Expand Down

15 changes: 7 additions & 8 deletions
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.fs.FSExceptionMessages;
import org.apache.hadoop.fs.FileEncryptionInfo;
import org.apache.hadoop.hdds.client.ReplicationConfig;
Expand All@@ -32,7 +31,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.io.retry.RetryPolicies;
import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
Expand All@@ -48,6 +47,7 @@

import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand All@@ -63,7 +63,7 @@
 *
 * TODO : currently not support multi-thread access.
 */
public class KeyDataStreamOutput implements ByteBufStreamOutput {
public class KeyDataStreamOutput implements ByteBufferStreamOutput {

 private OzoneClientConfig config;

Expand DownExpand Up@@ -185,17 +185,16 @@ public void addPreallocateBlocks(OmKeyLocationInfoGroup version,
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkNotClosed();
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = b.readableBytes();
 handleWrite(b, b.readerIndex(), len, false);
 handleWrite(b, off, len, false);
 writeOffset += len;
 }

 private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 private void handleWrite(ByteBuffer b, int off, long len, boolean retry)
 throws IOException {
 while (len > 0) {
 try {
Expand DownExpand Up@@ -227,7 +226,7 @@ private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 }

 private int writeToDataStreamOutput(BlockDataStreamOutputEntry current,
 boolean retry, long len, ByteBuf b, int writeLen, int off,
 boolean retry, long len, ByteBuffer b, int writeLen, int off,
 long currentPos) throws IOException {
 try {
 if (retry) {
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-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput by kaijchen · Pull Request #2603 · apache/ozone · GitHub
Skip to content
HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput#2603

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

szetszwo
merged 8 commits into

from

Sep 8, 2021
 Merged


HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput
#2603
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
95e10c5

ByteBufStreamOutput -> ByteBufferStreamOutput


kaijchen Sep 1, 2021
73ab352

Use write(b, off, len) to implement write(b)


kaijchen Sep 1, 2021
de0c64e

fix empty chunk


kaijchen Sep 1, 2021
7bb9ddd

separate tests


kaijchen Sep 1, 2021
9d02448

abstract testWrite(length) method


kaijchen Sep 1, 2021
5cf210b

change param in writeChunkToContainer()


kaijchen Sep 7, 2021
453c47e

fix style


kaijchen Sep 7, 2021
d694e82

update javadoc


kaijchen Sep 7, 2021

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


4 changes: 0 additions & 4 deletions
hadoop-hdds/client/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 <version>${spotbugs.version}</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>io.netty</groupId>
 <artifactId>netty-buffer</artifactId>
 </dependency>
 </dependencies>

 <build>
Expand Down

26 changes: 14 additions & 12 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@@ -20,7 +20,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
Expand All@@ -46,6 +45,7 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand All@@ -59,7 +59,7 @@
import static org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls.putBlockAsync;

/**
 * An {@link ByteBufStreamOutput} used by the REST service in combination
 * An {@link ByteBufferStreamOutput} used by the REST service in combination
 * with the SCMClient to write the value of a key to a sequence
 * of container chunks. Writes are buffered locally and periodically written to
 * the container as a new chunk. In order to preserve the semantics that
Expand All@@ -74,7 +74,7 @@
 * This class encapsulates all state management for buffering and writing
 * through to the container.
 */
public class BlockDataStreamOutput implements ByteBufStreamOutput {
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);
 public static final String EXCEPTION_MSG =
Expand DownExpand Up@@ -209,16 +209,16 @@ public IOException getIoException() {
 }

 @Override
 public void write(ByteBuf buf) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkOpen();
 if (buf == null) {
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = buf.readableBytes();
 if (len == 0) {
 return;
 }
 writeChunkToContainer(buf);
 writeChunkToContainer(
 (ByteBuffer) b.asReadOnlyBuffer().position(off).limit(off + len));

 writtenDataLength += len;
 }
Expand DownExpand Up@@ -476,15 +476,17 @@ private boolean needSync(long position) {
 * Writes buffered data as a new chunk to the container and saves chunk
 * information to be used later in putKey call.
 *
 * @param buf chunk data to write, from position to limit
 * @throws IOException if there is an I/O error while performing the call
 * @throws OzoneChecksumException if there is an error while computing
 * checksum
 */
 private void writeChunkToContainer(ByteBuf buf)
 private void writeChunkToContainer(ByteBuffer buf)
 throws IOException {
 ChecksumData checksumData = checksum.computeChecksum(buf.nioBuffer());
 int effectiveChunkSize = buf.readableBytes();
 final int effectiveChunkSize = buf.remaining();
 final long offset = chunkOffset.getAndAdd(effectiveChunkSize);
 ChecksumData checksumData =
 checksum.computeChecksum(buf.asReadOnlyBuffer());
 ChunkInfo chunkInfo = ChunkInfo.newBuilder()
 .setChunkName(blockID.get().getLocalID() + "_chunk_" + ++chunkIndex)
 .setOffset(offset)
Expand All@@ -499,8 +501,8 @@ private void writeChunkToContainer(ByteBuf buf)

 CompletableFuture<DataStreamReply> future =
 (needSync(offset + effectiveChunkSize) ?
 out.writeAsync(buf.nioBuffer(), StandardWriteOption.SYNC) :
 out.writeAsync(buf.nioBuffer()))
 out.writeAsync(buf, StandardWriteOption.SYNC) :
 out.writeAsync(buf))
 .whenCompleteAsync((r, e) -> {
 if (e != null || !r.isSuccess()) {
 if (e == null) {
Expand Down

15 changes: 7 additions & 8 deletions
...hdds/scm/storage/ByteBufStreamOutput.java → ...s/scm/storage/ByteBufferStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,24 @@

package org.apache.hadoop.hdds.scm.storage;

import io.netty.buffer.ByteBuf;

import java.io.Closeable;
import java.io.IOException;
import java.nio.ByteBuffer;

/**
* This interface is for writing an output stream of ByteBuffers.
* An ByteBufStreamOutput accepts Netty ByteBuf and sends them to some sink.
* An ByteBufferStreamOutput accepts nio ByteBuffer and sends them to some sink.
*/
public interface ByteBufStreamOutput extends Closeable {
public interface ByteBufferStreamOutput extends Closeable {
 /**
 * Try to write all the bytes in ByteBuf b to DataStream.
 *
 * @param b the data.
 * @exception IOException if an I/O error occurs.
 */
 void write(ByteBuf b) throws IOException;
 default void write(ByteBuffer b) throws IOException {
 write(b, b.position(), b.remaining());
 }

 /**
 * Try to write the [off:off + len) slice in ByteBuf b to DataStream.
Expand All@@ -44,9 +45,7 @@ public interface ByteBufStreamOutput extends Closeable {
 * @param len the number of bytes to write.
 * @exception IOException if an I/O error occurs.
 */
 default void write(ByteBuf b, int off, int len) throws IOException {
 write(b.slice(off, len));
 }
 void write(ByteBuffer b, int off, int len) throws IOException;

 /**
 * Flushes this DataStream output and forces any buffered output bytes
Expand Down

51 changes: 25 additions & 26 deletions
...ne/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockDataStreamOutputEntry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,29 +18,29 @@
package org.apache.hadoop.ozone.client.io;

import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
import org.apache.hadoop.hdds.scm.XceiverClientFactory;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.storage.BlockDataStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.security.token.Token;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Collections;

/**
 * Helper class used inside {@link BlockDataStreamOutput}.
 * */
public final class BlockDataStreamOutputEntry
 implements ByteBufStreamOutput {
 implements ByteBufferStreamOutput {

 private final OzoneClientConfig config;
 private ByteBufStreamOutput byteBufStreamOutput;
 private ByteBufferStreamOutput byteBufferStreamOutput;
 private BlockID blockID;
 private final String key;
 private final XceiverClientFactory xceiverClientManager;
Expand All@@ -61,7 +61,7 @@ private BlockDataStreamOutputEntry(
 OzoneClientConfig config
 ) {
 this.config = config;
 this.byteBufStreamOutput = null;
 this.byteBufferStreamOutput = null;
 this.blockID = blockID;
 this.key = key;
 this.xceiverClientManager = xceiverClientManager;
Expand DownExpand Up@@ -90,63 +90,62 @@ long getRemaining() {
 * @throws IOException if xceiverClient initialization fails
 */
 private void checkStream() throws IOException {
 if (this.byteBufStreamOutput == null) {
 this.byteBufStreamOutput =
 if (this.byteBufferStreamOutput == null) {
 this.byteBufferStreamOutput =
 new BlockDataStreamOutput(blockID, xceiverClientManager,
 pipeline, config, token);
 }
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkStream();
 final int len = b.readableBytes();
 byteBufStreamOutput.write(b);
 byteBufferStreamOutput.write(b, off, len);
 this.currentPosition += len;
 }

 @Override
 public void flush() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.flush();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.flush();
 }
 }

 @Override
 public void close() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.close();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.close();
 // after closing the chunkOutPutStream, blockId would have been
 // reconstructed with updated bcsId
 this.blockID =
 ((BlockDataStreamOutput) byteBufStreamOutput).getBlockID();
 ((BlockDataStreamOutput) byteBufferStreamOutput).getBlockID();
 }
 }

 boolean isClosed() {
 if (byteBufStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufStreamOutput).isClosed();
 if (byteBufferStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufferStreamOutput).isClosed();
 }
 return false;
 }

 Collection<DatanodeDetails> getFailedServers() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getFailedServers();
 }
 return Collections.emptyList();
 }

 long getWrittenDataLength() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getWrittenDataLength();
 } else {
 // For a pre allocated block for which no write has been initiated,
 // the ByteBufStreamOutput will be null here.
 // the ByteBufferStreamOutput will be null here.
 // In such cases, the default blockCommitSequenceId will be 0
 return 0;
 }
Expand All@@ -155,15 +154,15 @@ long getWrittenDataLength() {
 void cleanup(boolean invalidateClient) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.cleanup(invalidateClient);

 }

 void writeOnRetry(long len) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.writeOnRetry(len);
 this.currentPosition += len;

Expand DownExpand Up@@ -231,8 +230,8 @@ public BlockDataStreamOutputEntry build() {
 }

 @VisibleForTesting
 public ByteBufStreamOutput getByteBufStreamOutput() {
 return byteBufStreamOutput;
 public ByteBufferStreamOutput getByteBufStreamOutput() {
 return byteBufferStreamOutput;
 }

 public BlockID getBlockID() {
Expand Down

15 changes: 7 additions & 8 deletions
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.fs.FSExceptionMessages;
import org.apache.hadoop.fs.FileEncryptionInfo;
import org.apache.hadoop.hdds.client.ReplicationConfig;
Expand All@@ -32,7 +31,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.io.retry.RetryPolicies;
import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
Expand All@@ -48,6 +47,7 @@

import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand All@@ -63,7 +63,7 @@
 *
 * TODO : currently not support multi-thread access.
 */
public class KeyDataStreamOutput implements ByteBufStreamOutput {
public class KeyDataStreamOutput implements ByteBufferStreamOutput {

 private OzoneClientConfig config;

Expand DownExpand Up@@ -185,17 +185,16 @@ public void addPreallocateBlocks(OmKeyLocationInfoGroup version,
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkNotClosed();
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = b.readableBytes();
 handleWrite(b, b.readerIndex(), len, false);
 handleWrite(b, off, len, false);
 writeOffset += len;
 }

 private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 private void handleWrite(ByteBuffer b, int off, long len, boolean retry)
 throws IOException {
 while (len > 0) {
 try {
Expand DownExpand Up@@ -227,7 +226,7 @@ private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 }

 private int writeToDataStreamOutput(BlockDataStreamOutputEntry current,
 boolean retry, long len, ByteBuf b, int writeLen, int off,
 boolean retry, long len, ByteBuffer b, int writeLen, int off,
 long currentPos) throws IOException {
 try {
 if (retry) {
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-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput by kaijchen · Pull Request #2603 · apache/ozone · GitHub
Skip to content
HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput#2603

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

szetszwo
merged 8 commits into

from

Sep 8, 2021
 Merged


HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput
#2603
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
95e10c5

ByteBufStreamOutput -> ByteBufferStreamOutput


kaijchen Sep 1, 2021
73ab352

Use write(b, off, len) to implement write(b)


kaijchen Sep 1, 2021
de0c64e

fix empty chunk


kaijchen Sep 1, 2021
7bb9ddd

separate tests


kaijchen Sep 1, 2021
9d02448

abstract testWrite(length) method


kaijchen Sep 1, 2021
5cf210b

change param in writeChunkToContainer()


kaijchen Sep 7, 2021
453c47e

fix style


kaijchen Sep 7, 2021
d694e82

update javadoc


kaijchen Sep 7, 2021

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


4 changes: 0 additions & 4 deletions
hadoop-hdds/client/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 <version>${spotbugs.version}</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>io.netty</groupId>
 <artifactId>netty-buffer</artifactId>
 </dependency>
 </dependencies>

 <build>
Expand Down

26 changes: 14 additions & 12 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@@ -20,7 +20,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
Expand All@@ -46,6 +45,7 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand All@@ -59,7 +59,7 @@
import static org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls.putBlockAsync;

/**
 * An {@link ByteBufStreamOutput} used by the REST service in combination
 * An {@link ByteBufferStreamOutput} used by the REST service in combination
 * with the SCMClient to write the value of a key to a sequence
 * of container chunks. Writes are buffered locally and periodically written to
 * the container as a new chunk. In order to preserve the semantics that
Expand All@@ -74,7 +74,7 @@
 * This class encapsulates all state management for buffering and writing
 * through to the container.
 */
public class BlockDataStreamOutput implements ByteBufStreamOutput {
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);
 public static final String EXCEPTION_MSG =
Expand DownExpand Up@@ -209,16 +209,16 @@ public IOException getIoException() {
 }

 @Override
 public void write(ByteBuf buf) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkOpen();
 if (buf == null) {
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = buf.readableBytes();
 if (len == 0) {
 return;
 }
 writeChunkToContainer(buf);
 writeChunkToContainer(
 (ByteBuffer) b.asReadOnlyBuffer().position(off).limit(off + len));

 writtenDataLength += len;
 }
Expand DownExpand Up@@ -476,15 +476,17 @@ private boolean needSync(long position) {
 * Writes buffered data as a new chunk to the container and saves chunk
 * information to be used later in putKey call.
 *
 * @param buf chunk data to write, from position to limit
 * @throws IOException if there is an I/O error while performing the call
 * @throws OzoneChecksumException if there is an error while computing
 * checksum
 */
 private void writeChunkToContainer(ByteBuf buf)
 private void writeChunkToContainer(ByteBuffer buf)
 throws IOException {
 ChecksumData checksumData = checksum.computeChecksum(buf.nioBuffer());
 int effectiveChunkSize = buf.readableBytes();
 final int effectiveChunkSize = buf.remaining();
 final long offset = chunkOffset.getAndAdd(effectiveChunkSize);
 ChecksumData checksumData =
 checksum.computeChecksum(buf.asReadOnlyBuffer());
 ChunkInfo chunkInfo = ChunkInfo.newBuilder()
 .setChunkName(blockID.get().getLocalID() + "_chunk_" + ++chunkIndex)
 .setOffset(offset)
Expand All@@ -499,8 +501,8 @@ private void writeChunkToContainer(ByteBuf buf)

 CompletableFuture<DataStreamReply> future =
 (needSync(offset + effectiveChunkSize) ?
 out.writeAsync(buf.nioBuffer(), StandardWriteOption.SYNC) :
 out.writeAsync(buf.nioBuffer()))
 out.writeAsync(buf, StandardWriteOption.SYNC) :
 out.writeAsync(buf))
 .whenCompleteAsync((r, e) -> {
 if (e != null || !r.isSuccess()) {
 if (e == null) {
Expand Down

15 changes: 7 additions & 8 deletions
...hdds/scm/storage/ByteBufStreamOutput.java → ...s/scm/storage/ByteBufferStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,24 @@

package org.apache.hadoop.hdds.scm.storage;

import io.netty.buffer.ByteBuf;

import java.io.Closeable;
import java.io.IOException;
import java.nio.ByteBuffer;

/**
* This interface is for writing an output stream of ByteBuffers.
* An ByteBufStreamOutput accepts Netty ByteBuf and sends them to some sink.
* An ByteBufferStreamOutput accepts nio ByteBuffer and sends them to some sink.
*/
public interface ByteBufStreamOutput extends Closeable {
public interface ByteBufferStreamOutput extends Closeable {
 /**
 * Try to write all the bytes in ByteBuf b to DataStream.
 *
 * @param b the data.
 * @exception IOException if an I/O error occurs.
 */
 void write(ByteBuf b) throws IOException;
 default void write(ByteBuffer b) throws IOException {
 write(b, b.position(), b.remaining());
 }

 /**
 * Try to write the [off:off + len) slice in ByteBuf b to DataStream.
Expand All@@ -44,9 +45,7 @@ public interface ByteBufStreamOutput extends Closeable {
 * @param len the number of bytes to write.
 * @exception IOException if an I/O error occurs.
 */
 default void write(ByteBuf b, int off, int len) throws IOException {
 write(b.slice(off, len));
 }
 void write(ByteBuffer b, int off, int len) throws IOException;

 /**
 * Flushes this DataStream output and forces any buffered output bytes
Expand Down

51 changes: 25 additions & 26 deletions
...ne/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockDataStreamOutputEntry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,29 +18,29 @@
package org.apache.hadoop.ozone.client.io;

import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
import org.apache.hadoop.hdds.scm.XceiverClientFactory;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.storage.BlockDataStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.security.token.Token;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Collections;

/**
 * Helper class used inside {@link BlockDataStreamOutput}.
 * */
public final class BlockDataStreamOutputEntry
 implements ByteBufStreamOutput {
 implements ByteBufferStreamOutput {

 private final OzoneClientConfig config;
 private ByteBufStreamOutput byteBufStreamOutput;
 private ByteBufferStreamOutput byteBufferStreamOutput;
 private BlockID blockID;
 private final String key;
 private final XceiverClientFactory xceiverClientManager;
Expand All@@ -61,7 +61,7 @@ private BlockDataStreamOutputEntry(
 OzoneClientConfig config
 ) {
 this.config = config;
 this.byteBufStreamOutput = null;
 this.byteBufferStreamOutput = null;
 this.blockID = blockID;
 this.key = key;
 this.xceiverClientManager = xceiverClientManager;
Expand DownExpand Up@@ -90,63 +90,62 @@ long getRemaining() {
 * @throws IOException if xceiverClient initialization fails
 */
 private void checkStream() throws IOException {
 if (this.byteBufStreamOutput == null) {
 this.byteBufStreamOutput =
 if (this.byteBufferStreamOutput == null) {
 this.byteBufferStreamOutput =
 new BlockDataStreamOutput(blockID, xceiverClientManager,
 pipeline, config, token);
 }
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkStream();
 final int len = b.readableBytes();
 byteBufStreamOutput.write(b);
 byteBufferStreamOutput.write(b, off, len);
 this.currentPosition += len;
 }

 @Override
 public void flush() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.flush();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.flush();
 }
 }

 @Override
 public void close() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.close();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.close();
 // after closing the chunkOutPutStream, blockId would have been
 // reconstructed with updated bcsId
 this.blockID =
 ((BlockDataStreamOutput) byteBufStreamOutput).getBlockID();
 ((BlockDataStreamOutput) byteBufferStreamOutput).getBlockID();
 }
 }

 boolean isClosed() {
 if (byteBufStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufStreamOutput).isClosed();
 if (byteBufferStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufferStreamOutput).isClosed();
 }
 return false;
 }

 Collection<DatanodeDetails> getFailedServers() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getFailedServers();
 }
 return Collections.emptyList();
 }

 long getWrittenDataLength() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getWrittenDataLength();
 } else {
 // For a pre allocated block for which no write has been initiated,
 // the ByteBufStreamOutput will be null here.
 // the ByteBufferStreamOutput will be null here.
 // In such cases, the default blockCommitSequenceId will be 0
 return 0;
 }
Expand All@@ -155,15 +154,15 @@ long getWrittenDataLength() {
 void cleanup(boolean invalidateClient) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.cleanup(invalidateClient);

 }

 void writeOnRetry(long len) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.writeOnRetry(len);
 this.currentPosition += len;

Expand DownExpand Up@@ -231,8 +230,8 @@ public BlockDataStreamOutputEntry build() {
 }

 @VisibleForTesting
 public ByteBufStreamOutput getByteBufStreamOutput() {
 return byteBufStreamOutput;
 public ByteBufferStreamOutput getByteBufStreamOutput() {
 return byteBufferStreamOutput;
 }

 public BlockID getBlockID() {
Expand Down

15 changes: 7 additions & 8 deletions
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.fs.FSExceptionMessages;
import org.apache.hadoop.fs.FileEncryptionInfo;
import org.apache.hadoop.hdds.client.ReplicationConfig;
Expand All@@ -32,7 +31,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.io.retry.RetryPolicies;
import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
Expand All@@ -48,6 +47,7 @@

import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand All@@ -63,7 +63,7 @@
 *
 * TODO : currently not support multi-thread access.
 */
public class KeyDataStreamOutput implements ByteBufStreamOutput {
public class KeyDataStreamOutput implements ByteBufferStreamOutput {

 private OzoneClientConfig config;

Expand DownExpand Up@@ -185,17 +185,16 @@ public void addPreallocateBlocks(OmKeyLocationInfoGroup version,
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkNotClosed();
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = b.readableBytes();
 handleWrite(b, b.readerIndex(), len, false);
 handleWrite(b, off, len, false);
 writeOffset += len;
 }

 private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 private void handleWrite(ByteBuffer b, int off, long len, boolean retry)
 throws IOException {
 while (len > 0) {
 try {
Expand DownExpand Up@@ -227,7 +226,7 @@ private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 }

 private int writeToDataStreamOutput(BlockDataStreamOutputEntry current,
 boolean retry, long len, ByteBuf b, int writeLen, int off,
 boolean retry, long len, ByteBuffer b, int writeLen, int off,
 long currentPos) throws IOException {
 try {
 if (retry) {
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-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput by kaijchen · Pull Request #2603 · apache/ozone · GitHub
Skip to content
HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput#2603

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

szetszwo
merged 8 commits into

from

Sep 8, 2021
 Merged


HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput
#2603
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
95e10c5

ByteBufStreamOutput -> ByteBufferStreamOutput


kaijchen Sep 1, 2021
73ab352

Use write(b, off, len) to implement write(b)


kaijchen Sep 1, 2021
de0c64e

fix empty chunk


kaijchen Sep 1, 2021
7bb9ddd

separate tests


kaijchen Sep 1, 2021
9d02448

abstract testWrite(length) method


kaijchen Sep 1, 2021
5cf210b

change param in writeChunkToContainer()


kaijchen Sep 7, 2021
453c47e

fix style


kaijchen Sep 7, 2021
d694e82

update javadoc


kaijchen Sep 7, 2021

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


4 changes: 0 additions & 4 deletions
hadoop-hdds/client/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 <version>${spotbugs.version}</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>io.netty</groupId>
 <artifactId>netty-buffer</artifactId>
 </dependency>
 </dependencies>

 <build>
Expand Down

26 changes: 14 additions & 12 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@@ -20,7 +20,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
Expand All@@ -46,6 +45,7 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand All@@ -59,7 +59,7 @@
import static org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls.putBlockAsync;

/**
 * An {@link ByteBufStreamOutput} used by the REST service in combination
 * An {@link ByteBufferStreamOutput} used by the REST service in combination
 * with the SCMClient to write the value of a key to a sequence
 * of container chunks. Writes are buffered locally and periodically written to
 * the container as a new chunk. In order to preserve the semantics that
Expand All@@ -74,7 +74,7 @@
 * This class encapsulates all state management for buffering and writing
 * through to the container.
 */
public class BlockDataStreamOutput implements ByteBufStreamOutput {
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);
 public static final String EXCEPTION_MSG =
Expand DownExpand Up@@ -209,16 +209,16 @@ public IOException getIoException() {
 }

 @Override
 public void write(ByteBuf buf) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkOpen();
 if (buf == null) {
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = buf.readableBytes();
 if (len == 0) {
 return;
 }
 writeChunkToContainer(buf);
 writeChunkToContainer(
 (ByteBuffer) b.asReadOnlyBuffer().position(off).limit(off + len));

 writtenDataLength += len;
 }
Expand DownExpand Up@@ -476,15 +476,17 @@ private boolean needSync(long position) {
 * Writes buffered data as a new chunk to the container and saves chunk
 * information to be used later in putKey call.
 *
 * @param buf chunk data to write, from position to limit
 * @throws IOException if there is an I/O error while performing the call
 * @throws OzoneChecksumException if there is an error while computing
 * checksum
 */
 private void writeChunkToContainer(ByteBuf buf)
 private void writeChunkToContainer(ByteBuffer buf)
 throws IOException {
 ChecksumData checksumData = checksum.computeChecksum(buf.nioBuffer());
 int effectiveChunkSize = buf.readableBytes();
 final int effectiveChunkSize = buf.remaining();
 final long offset = chunkOffset.getAndAdd(effectiveChunkSize);
 ChecksumData checksumData =
 checksum.computeChecksum(buf.asReadOnlyBuffer());
 ChunkInfo chunkInfo = ChunkInfo.newBuilder()
 .setChunkName(blockID.get().getLocalID() + "_chunk_" + ++chunkIndex)
 .setOffset(offset)
Expand All@@ -499,8 +501,8 @@ private void writeChunkToContainer(ByteBuf buf)

 CompletableFuture<DataStreamReply> future =
 (needSync(offset + effectiveChunkSize) ?
 out.writeAsync(buf.nioBuffer(), StandardWriteOption.SYNC) :
 out.writeAsync(buf.nioBuffer()))
 out.writeAsync(buf, StandardWriteOption.SYNC) :
 out.writeAsync(buf))
 .whenCompleteAsync((r, e) -> {
 if (e != null || !r.isSuccess()) {
 if (e == null) {
Expand Down

15 changes: 7 additions & 8 deletions
...hdds/scm/storage/ByteBufStreamOutput.java → ...s/scm/storage/ByteBufferStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,24 @@

package org.apache.hadoop.hdds.scm.storage;

import io.netty.buffer.ByteBuf;

import java.io.Closeable;
import java.io.IOException;
import java.nio.ByteBuffer;

/**
* This interface is for writing an output stream of ByteBuffers.
* An ByteBufStreamOutput accepts Netty ByteBuf and sends them to some sink.
* An ByteBufferStreamOutput accepts nio ByteBuffer and sends them to some sink.
*/
public interface ByteBufStreamOutput extends Closeable {
public interface ByteBufferStreamOutput extends Closeable {
 /**
 * Try to write all the bytes in ByteBuf b to DataStream.
 *
 * @param b the data.
 * @exception IOException if an I/O error occurs.
 */
 void write(ByteBuf b) throws IOException;
 default void write(ByteBuffer b) throws IOException {
 write(b, b.position(), b.remaining());
 }

 /**
 * Try to write the [off:off + len) slice in ByteBuf b to DataStream.
Expand All@@ -44,9 +45,7 @@ public interface ByteBufStreamOutput extends Closeable {
 * @param len the number of bytes to write.
 * @exception IOException if an I/O error occurs.
 */
 default void write(ByteBuf b, int off, int len) throws IOException {
 write(b.slice(off, len));
 }
 void write(ByteBuffer b, int off, int len) throws IOException;

 /**
 * Flushes this DataStream output and forces any buffered output bytes
Expand Down

51 changes: 25 additions & 26 deletions
...ne/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockDataStreamOutputEntry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,29 +18,29 @@
package org.apache.hadoop.ozone.client.io;

import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
import org.apache.hadoop.hdds.scm.XceiverClientFactory;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.storage.BlockDataStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.security.token.Token;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Collections;

/**
 * Helper class used inside {@link BlockDataStreamOutput}.
 * */
public final class BlockDataStreamOutputEntry
 implements ByteBufStreamOutput {
 implements ByteBufferStreamOutput {

 private final OzoneClientConfig config;
 private ByteBufStreamOutput byteBufStreamOutput;
 private ByteBufferStreamOutput byteBufferStreamOutput;
 private BlockID blockID;
 private final String key;
 private final XceiverClientFactory xceiverClientManager;
Expand All@@ -61,7 +61,7 @@ private BlockDataStreamOutputEntry(
 OzoneClientConfig config
 ) {
 this.config = config;
 this.byteBufStreamOutput = null;
 this.byteBufferStreamOutput = null;
 this.blockID = blockID;
 this.key = key;
 this.xceiverClientManager = xceiverClientManager;
Expand DownExpand Up@@ -90,63 +90,62 @@ long getRemaining() {
 * @throws IOException if xceiverClient initialization fails
 */
 private void checkStream() throws IOException {
 if (this.byteBufStreamOutput == null) {
 this.byteBufStreamOutput =
 if (this.byteBufferStreamOutput == null) {
 this.byteBufferStreamOutput =
 new BlockDataStreamOutput(blockID, xceiverClientManager,
 pipeline, config, token);
 }
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkStream();
 final int len = b.readableBytes();
 byteBufStreamOutput.write(b);
 byteBufferStreamOutput.write(b, off, len);
 this.currentPosition += len;
 }

 @Override
 public void flush() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.flush();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.flush();
 }
 }

 @Override
 public void close() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.close();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.close();
 // after closing the chunkOutPutStream, blockId would have been
 // reconstructed with updated bcsId
 this.blockID =
 ((BlockDataStreamOutput) byteBufStreamOutput).getBlockID();
 ((BlockDataStreamOutput) byteBufferStreamOutput).getBlockID();
 }
 }

 boolean isClosed() {
 if (byteBufStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufStreamOutput).isClosed();
 if (byteBufferStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufferStreamOutput).isClosed();
 }
 return false;
 }

 Collection<DatanodeDetails> getFailedServers() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getFailedServers();
 }
 return Collections.emptyList();
 }

 long getWrittenDataLength() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getWrittenDataLength();
 } else {
 // For a pre allocated block for which no write has been initiated,
 // the ByteBufStreamOutput will be null here.
 // the ByteBufferStreamOutput will be null here.
 // In such cases, the default blockCommitSequenceId will be 0
 return 0;
 }
Expand All@@ -155,15 +154,15 @@ long getWrittenDataLength() {
 void cleanup(boolean invalidateClient) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.cleanup(invalidateClient);

 }

 void writeOnRetry(long len) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.writeOnRetry(len);
 this.currentPosition += len;

Expand DownExpand Up@@ -231,8 +230,8 @@ public BlockDataStreamOutputEntry build() {
 }

 @VisibleForTesting
 public ByteBufStreamOutput getByteBufStreamOutput() {
 return byteBufStreamOutput;
 public ByteBufferStreamOutput getByteBufStreamOutput() {
 return byteBufferStreamOutput;
 }

 public BlockID getBlockID() {
Expand Down

15 changes: 7 additions & 8 deletions
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.fs.FSExceptionMessages;
import org.apache.hadoop.fs.FileEncryptionInfo;
import org.apache.hadoop.hdds.client.ReplicationConfig;
Expand All@@ -32,7 +31,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.io.retry.RetryPolicies;
import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
Expand All@@ -48,6 +47,7 @@

import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand All@@ -63,7 +63,7 @@
 *
 * TODO : currently not support multi-thread access.
 */
public class KeyDataStreamOutput implements ByteBufStreamOutput {
public class KeyDataStreamOutput implements ByteBufferStreamOutput {

 private OzoneClientConfig config;

Expand DownExpand Up@@ -185,17 +185,16 @@ public void addPreallocateBlocks(OmKeyLocationInfoGroup version,
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkNotClosed();
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = b.readableBytes();
 handleWrite(b, b.readerIndex(), len, false);
 handleWrite(b, off, len, false);
 writeOffset += len;
 }

 private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 private void handleWrite(ByteBuffer b, int off, long len, boolean retry)
 throws IOException {
 while (len > 0) {
 try {
Expand DownExpand Up@@ -227,7 +226,7 @@ private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 }

 private int writeToDataStreamOutput(BlockDataStreamOutputEntry current,
 boolean retry, long len, ByteBuf b, int writeLen, int off,
 boolean retry, long len, ByteBuffer b, int writeLen, int off,
 long currentPos) throws IOException {
 try {
 if (retry) {
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-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput by kaijchen · Pull Request #2603 · apache/ozone · GitHub
Skip to content
HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput#2603

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

szetszwo
merged 8 commits into

from

Sep 8, 2021
 Merged


HDDS-5705. [Ozone-Streaming] Change ByteBufStreamOutput to ByteBufferStreamOutput
#2603
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
95e10c5

ByteBufStreamOutput -> ByteBufferStreamOutput


kaijchen Sep 1, 2021
73ab352

Use write(b, off, len) to implement write(b)


kaijchen Sep 1, 2021
de0c64e

fix empty chunk


kaijchen Sep 1, 2021
7bb9ddd

separate tests


kaijchen Sep 1, 2021
9d02448

abstract testWrite(length) method


kaijchen Sep 1, 2021
5cf210b

change param in writeChunkToContainer()


kaijchen Sep 7, 2021
453c47e

fix style


kaijchen Sep 7, 2021
d694e82

update javadoc


kaijchen Sep 7, 2021

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


4 changes: 0 additions & 4 deletions
hadoop-hdds/client/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,10 +66,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
 <version>${spotbugs.version}</version>
 <scope>provided</scope>
 </dependency>
 <dependency>
 <groupId>io.netty</groupId>
 <artifactId>netty-buffer</artifactId>
 </dependency>
 </dependencies>

 <build>
Expand Down

26 changes: 14 additions & 12 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@@ -20,7 +20,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
Expand All@@ -46,6 +45,7 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand All@@ -59,7 +59,7 @@
import static org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls.putBlockAsync;

/**
 * An {@link ByteBufStreamOutput} used by the REST service in combination
 * An {@link ByteBufferStreamOutput} used by the REST service in combination
 * with the SCMClient to write the value of a key to a sequence
 * of container chunks. Writes are buffered locally and periodically written to
 * the container as a new chunk. In order to preserve the semantics that
Expand All@@ -74,7 +74,7 @@
 * This class encapsulates all state management for buffering and writing
 * through to the container.
 */
public class BlockDataStreamOutput implements ByteBufStreamOutput {
public class BlockDataStreamOutput implements ByteBufferStreamOutput {
 public static final Logger LOG =
 LoggerFactory.getLogger(BlockDataStreamOutput.class);
 public static final String EXCEPTION_MSG =
Expand DownExpand Up@@ -209,16 +209,16 @@ public IOException getIoException() {
 }

 @Override
 public void write(ByteBuf buf) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkOpen();
 if (buf == null) {
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = buf.readableBytes();
 if (len == 0) {
 return;
 }
 writeChunkToContainer(buf);
 writeChunkToContainer(
 (ByteBuffer) b.asReadOnlyBuffer().position(off).limit(off + len));

 writtenDataLength += len;
 }
Expand DownExpand Up@@ -476,15 +476,17 @@ private boolean needSync(long position) {
 * Writes buffered data as a new chunk to the container and saves chunk
 * information to be used later in putKey call.
 *
 * @param buf chunk data to write, from position to limit
 * @throws IOException if there is an I/O error while performing the call
 * @throws OzoneChecksumException if there is an error while computing
 * checksum
 */
 private void writeChunkToContainer(ByteBuf buf)
 private void writeChunkToContainer(ByteBuffer buf)
 throws IOException {
 ChecksumData checksumData = checksum.computeChecksum(buf.nioBuffer());
 int effectiveChunkSize = buf.readableBytes();
 final int effectiveChunkSize = buf.remaining();
 final long offset = chunkOffset.getAndAdd(effectiveChunkSize);
 ChecksumData checksumData =
 checksum.computeChecksum(buf.asReadOnlyBuffer());
 ChunkInfo chunkInfo = ChunkInfo.newBuilder()
 .setChunkName(blockID.get().getLocalID() + "_chunk_" + ++chunkIndex)
 .setOffset(offset)
Expand All@@ -499,8 +501,8 @@ private void writeChunkToContainer(ByteBuf buf)

 CompletableFuture<DataStreamReply> future =
 (needSync(offset + effectiveChunkSize) ?
 out.writeAsync(buf.nioBuffer(), StandardWriteOption.SYNC) :
 out.writeAsync(buf.nioBuffer()))
 out.writeAsync(buf, StandardWriteOption.SYNC) :
 out.writeAsync(buf))
 .whenCompleteAsync((r, e) -> {
 if (e != null || !r.isSuccess()) {
 if (e == null) {
Expand Down

15 changes: 7 additions & 8 deletions
...hdds/scm/storage/ByteBufStreamOutput.java → ...s/scm/storage/ByteBufferStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,24 @@

package org.apache.hadoop.hdds.scm.storage;

import io.netty.buffer.ByteBuf;

import java.io.Closeable;
import java.io.IOException;
import java.nio.ByteBuffer;

/**
* This interface is for writing an output stream of ByteBuffers.
* An ByteBufStreamOutput accepts Netty ByteBuf and sends them to some sink.
* An ByteBufferStreamOutput accepts nio ByteBuffer and sends them to some sink.
*/
public interface ByteBufStreamOutput extends Closeable {
public interface ByteBufferStreamOutput extends Closeable {
 /**
 * Try to write all the bytes in ByteBuf b to DataStream.
 *
 * @param b the data.
 * @exception IOException if an I/O error occurs.
 */
 void write(ByteBuf b) throws IOException;
 default void write(ByteBuffer b) throws IOException {
 write(b, b.position(), b.remaining());
 }

 /**
 * Try to write the [off:off + len) slice in ByteBuf b to DataStream.
Expand All@@ -44,9 +45,7 @@ public interface ByteBufStreamOutput extends Closeable {
 * @param len the number of bytes to write.
 * @exception IOException if an I/O error occurs.
 */
 default void write(ByteBuf b, int off, int len) throws IOException {
 write(b.slice(off, len));
 }
 void write(ByteBuffer b, int off, int len) throws IOException;

 /**
 * Flushes this DataStream output and forces any buffered output bytes
Expand Down

51 changes: 25 additions & 26 deletions
...ne/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockDataStreamOutputEntry.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,29 +18,29 @@
package org.apache.hadoop.ozone.client.io;

import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
import org.apache.hadoop.hdds.scm.XceiverClientFactory;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.storage.BlockDataStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
import org.apache.hadoop.security.token.Token;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Collections;

/**
 * Helper class used inside {@link BlockDataStreamOutput}.
 * */
public final class BlockDataStreamOutputEntry
 implements ByteBufStreamOutput {
 implements ByteBufferStreamOutput {

 private final OzoneClientConfig config;
 private ByteBufStreamOutput byteBufStreamOutput;
 private ByteBufferStreamOutput byteBufferStreamOutput;
 private BlockID blockID;
 private final String key;
 private final XceiverClientFactory xceiverClientManager;
Expand All@@ -61,7 +61,7 @@ private BlockDataStreamOutputEntry(
 OzoneClientConfig config
 ) {
 this.config = config;
 this.byteBufStreamOutput = null;
 this.byteBufferStreamOutput = null;
 this.blockID = blockID;
 this.key = key;
 this.xceiverClientManager = xceiverClientManager;
Expand DownExpand Up@@ -90,63 +90,62 @@ long getRemaining() {
 * @throws IOException if xceiverClient initialization fails
 */
 private void checkStream() throws IOException {
 if (this.byteBufStreamOutput == null) {
 this.byteBufStreamOutput =
 if (this.byteBufferStreamOutput == null) {
 this.byteBufferStreamOutput =
 new BlockDataStreamOutput(blockID, xceiverClientManager,
 pipeline, config, token);
 }
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkStream();
 final int len = b.readableBytes();
 byteBufStreamOutput.write(b);
 byteBufferStreamOutput.write(b, off, len);
 this.currentPosition += len;
 }

 @Override
 public void flush() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.flush();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.flush();
 }
 }

 @Override
 public void close() throws IOException {
 if (this.byteBufStreamOutput != null) {
 this.byteBufStreamOutput.close();
 if (this.byteBufferStreamOutput != null) {
 this.byteBufferStreamOutput.close();
 // after closing the chunkOutPutStream, blockId would have been
 // reconstructed with updated bcsId
 this.blockID =
 ((BlockDataStreamOutput) byteBufStreamOutput).getBlockID();
 ((BlockDataStreamOutput) byteBufferStreamOutput).getBlockID();
 }
 }

 boolean isClosed() {
 if (byteBufStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufStreamOutput).isClosed();
 if (byteBufferStreamOutput != null) {
 return ((BlockDataStreamOutput) byteBufferStreamOutput).isClosed();
 }
 return false;
 }

 Collection<DatanodeDetails> getFailedServers() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getFailedServers();
 }
 return Collections.emptyList();
 }

 long getWrittenDataLength() {
 if (byteBufStreamOutput != null) {
 if (byteBufferStreamOutput != null) {
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 return out.getWrittenDataLength();
 } else {
 // For a pre allocated block for which no write has been initiated,
 // the ByteBufStreamOutput will be null here.
 // the ByteBufferStreamOutput will be null here.
 // In such cases, the default blockCommitSequenceId will be 0
 return 0;
 }
Expand All@@ -155,15 +154,15 @@ long getWrittenDataLength() {
 void cleanup(boolean invalidateClient) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.cleanup(invalidateClient);

 }

 void writeOnRetry(long len) throws IOException {
 checkStream();
 BlockDataStreamOutput out =
 (BlockDataStreamOutput) this.byteBufStreamOutput;
 (BlockDataStreamOutput) this.byteBufferStreamOutput;
 out.writeOnRetry(len);
 this.currentPosition += len;

Expand DownExpand Up@@ -231,8 +230,8 @@ public BlockDataStreamOutputEntry build() {
 }

 @VisibleForTesting
 public ByteBufStreamOutput getByteBufStreamOutput() {
 return byteBufStreamOutput;
 public ByteBufferStreamOutput getByteBufStreamOutput() {
 return byteBufferStreamOutput;
 }

 public BlockID getBlockID() {
Expand Down

15 changes: 7 additions & 8 deletions
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyDataStreamOutput.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import org.apache.hadoop.fs.FSExceptionMessages;
import org.apache.hadoop.fs.FileEncryptionInfo;
import org.apache.hadoop.hdds.client.ReplicationConfig;
Expand All@@ -32,7 +31,7 @@
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.storage.ByteBufStreamOutput;
import org.apache.hadoop.hdds.scm.storage.ByteBufferStreamOutput;
import org.apache.hadoop.io.retry.RetryPolicies;
import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
Expand All@@ -48,6 +47,7 @@

import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand All@@ -63,7 +63,7 @@
 *
 * TODO : currently not support multi-thread access.
 */
public class KeyDataStreamOutput implements ByteBufStreamOutput {
public class KeyDataStreamOutput implements ByteBufferStreamOutput {

 private OzoneClientConfig config;

Expand DownExpand Up@@ -185,17 +185,16 @@ public void addPreallocateBlocks(OmKeyLocationInfoGroup version,
 }

 @Override
 public void write(ByteBuf b) throws IOException {
 public void write(ByteBuffer b, int off, int len) throws IOException {
 checkNotClosed();
 if (b == null) {
 throw new NullPointerException();
 }
 final int len = b.readableBytes();
 handleWrite(b, b.readerIndex(), len, false);
 handleWrite(b, off, len, false);
 writeOffset += len;
 }

 private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 private void handleWrite(ByteBuffer b, int off, long len, boolean retry)
 throws IOException {
 while (len > 0) {
 try {
Expand DownExpand Up@@ -227,7 +226,7 @@ private void handleWrite(ByteBuf b, int off, long len, boolean retry)
 }

 private int writeToDataStreamOutput(BlockDataStreamOutputEntry current,
 boolean retry, long len, ByteBuf b, int writeLen, int off,
 boolean retry, long len, ByteBuffer b, int writeLen, int off,
 long currentPos) throws IOException {
 try {
 if (retry) {
Expand Down
Loading