HDFS-15643. EC: Fix checksum computation in case of native encoders. (#2424). Contributed by Ayush Saxena.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockChecksumReconstructor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockChecksumReconstructor.java
index b2e6496..d9e2f60 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockChecksumReconstructor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockChecksumReconstructor.java
@@ -87,7 +87,7 @@
// step3: calculate checksum
checksumDataLen += checksumWithTargetOutput(
- targetBuffer.array(), toReconstructLen);
+ getBufferArray(targetBuffer), toReconstructLen);
updatePositionInBlock(toReconstructLen);
requestedLen -= toReconstructLen;
@@ -140,7 +140,7 @@
// case-2) length of data bytes which is less than bytesPerCRC
if (requestedLen <= toReconstructLen) {
int remainingLen = Math.toIntExact(requestedLen);
- outputData = Arrays.copyOf(targetBuffer.array(), remainingLen);
+ outputData = Arrays.copyOf(outputData, remainingLen);
int partialLength = remainingLen % getChecksum().getBytesPerChecksum();
@@ -207,4 +207,19 @@
public long getChecksumDataLen() {
return checksumDataLen;
}
-}
+
+ /**
+ * Gets an array corresponding the buffer.
+ * @param buffer the input buffer.
+ * @return the array with content of the buffer.
+ */
+ private static byte[] getBufferArray(ByteBuffer buffer) {
+ byte[] buff = new byte[buffer.remaining()];
+ if (buffer.hasArray()) {
+ buff = buffer.array();
+ } else {
+ buffer.slice().get(buff);
+ }
+ return buff;
+ }
+}
\ No newline at end of file
