This is an automated email from the ASF dual-hosted git repository. captainzmc pushed a commit to branch HDDS-4454 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit aea1d841fb9d0a9e5d7093b6b691586306237a8f Author: micah zhao <[email protected]> AuthorDate: Tue Oct 12 14:05:07 2021 +0800 HDDS-5849. [Ozone-Streaming]Write exceptions occur after checksum is enabled (#2729) --- .../java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java | 3 ++- .../org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java index 41e2c48bbb..2ae0ba7525 100644 --- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java +++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java @@ -519,7 +519,8 @@ public class BlockDataStreamOutput implements ByteBufferStreamOutput { throws IOException { final int effectiveChunkSize = buf.remaining(); final long offset = chunkOffset.getAndAdd(effectiveChunkSize); - ChecksumData checksumData = checksum.computeChecksum(buf); + ChecksumData checksumData = checksum.computeChecksum( + buf.asReadOnlyBuffer()); ChunkInfo chunkInfo = ChunkInfo.newBuilder() .setChunkName(blockID.get().getLocalID() + "_chunk_" + ++chunkIndex) .setOffset(offset) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java index 6d5401d651..d3b2d22577 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java @@ -20,7 +20,6 @@ package org.apache.hadoop.ozone.client.rpc; import org.apache.hadoop.conf.StorageUnit; import org.apache.hadoop.hdds.client.ReplicationType; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChecksumType; import org.apache.hadoop.hdds.scm.OzoneClientConfig; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; @@ -82,7 +81,6 @@ public class TestBlockDataStreamOutput { blockSize = 2 * maxFlushSize; OzoneClientConfig clientConfig = conf.getObject(OzoneClientConfig.class); - clientConfig.setChecksumType(ChecksumType.NONE); clientConfig.setStreamBufferFlushDelay(false); conf.setFromObject(clientConfig); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
