From bb35bff29b4a572a618ce1919d207c2a3cb93cd7 Mon Sep 17 00:00:00 2001 From: Mahadev Konar Date: Tue, 1 Nov 2011 23:07:56 +0000 Subject: [PATCH] MAPREDUCE-3332. contrib/raid compile breaks due to changes in hdfs/protocol/datatransfer/Sender#writeBlock related to checksum handling (Hitesh Shah via mahadev) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1196356 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../raid/src/java/org/apache/hadoop/raid/BlockFixer.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 85fd5a1d524..5e7b03524ab 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1909,6 +1909,9 @@ Release 0.23.0 - 2011-11-01 MAPREDUCE-3317. Rumen TraceBuilder is emiting null as hostname. (Ravi Gummadi via mahadev) + MAPREDUCE-3332. contrib/raid compile breaks due to changes in hdfs/protocol/datatransfer/ + Sender#writeBlock related to checksum handling (Hitesh Shah via mahadev) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java b/hadoop-mapreduce-project/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java index 863784a9c7b..5759fb0cd7b 100644 --- a/hadoop-mapreduce-project/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java +++ b/hadoop-mapreduce-project/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java @@ -782,7 +782,7 @@ private void sendFixedBlock(DatanodeInfo datanode, DatanodeInfo[] nodes = new DatanodeInfo[]{datanode}; new Sender(out).writeBlock(block.getBlock(), block.getBlockToken(), "", nodes, null, BlockConstructionStage.PIPELINE_SETUP_CREATE, - 1, 0L, blockSize, 0L); + 1, 0L, blockSize, 0L, DataChecksum.newDataChecksum(metadataIn)); blockSender.sendBlock(out, baseStream); LOG.info("Sent block " + block.getBlock() + " to " + datanode.name);