From 2555887f59414530d9309c95f1ed247eac5b97bb Mon Sep 17 00:00:00 2001 From: captainzmc Date: Mon, 11 Oct 2021 18:57:42 +0800 Subject: [PATCH 1/2] fix write --- .../apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java | 3 ++- .../hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java | 1 - 2 files changed, 2 insertions(+), 2 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 41e2c48bbbd8..2ae0ba75252e 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 @@ private void writeChunkToContainer(ByteBuffer buf) 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 6d5401d651d5..445653f99e10 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 @@ -82,7 +82,6 @@ public static void init() throws Exception { blockSize = 2 * maxFlushSize; OzoneClientConfig clientConfig = conf.getObject(OzoneClientConfig.class); - clientConfig.setChecksumType(ChecksumType.NONE); clientConfig.setStreamBufferFlushDelay(false); conf.setFromObject(clientConfig); From 396a06fdd26d57a03c0d73494a63a786fde2e9c8 Mon Sep 17 00:00:00 2001 From: captainzmc Date: Mon, 11 Oct 2021 19:21:51 +0800 Subject: [PATCH 2/2] fix checkstyle --- .../hadoop/ozone/client/rpc/TestBlockDataStreamOutput.java | 1 - 1 file changed, 1 deletion(-) 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 445653f99e10..d3b2d22577e9 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 @@ 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;