浏览代码

MAPREDUCE-3332. contrib/raid compile breaks due to changes in hdfs/protocol/datatransfer/Sender#writeBlock related to checksum handling (Hitesh Shah via mahadev) -Merging r1196356 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196366 13f79535-47bb-0310-9956-ffa450edef68
Mahadev Konar 13 年之前
父节点
当前提交
09f1d226ea

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -1873,6 +1873,9 @@ Release 0.23.0 - 2011-11-01
     MAPREDUCE-3317. Rumen TraceBuilder is emiting null as hostname.
     MAPREDUCE-3317. Rumen TraceBuilder is emiting null as hostname.
     (Ravi Gummadi via mahadev)
     (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
 Release 0.22.0 - Unreleased
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 1 - 1
hadoop-mapreduce-project/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java

@@ -782,7 +782,7 @@ public abstract class BlockFixer extends Configured implements Runnable {
         DatanodeInfo[] nodes = new DatanodeInfo[]{datanode};
         DatanodeInfo[] nodes = new DatanodeInfo[]{datanode};
         new Sender(out).writeBlock(block.getBlock(), block.getBlockToken(), "",
         new Sender(out).writeBlock(block.getBlock(), block.getBlockToken(), "",
             nodes, null, BlockConstructionStage.PIPELINE_SETUP_CREATE,
             nodes, null, BlockConstructionStage.PIPELINE_SETUP_CREATE,
-            1, 0L, blockSize, 0L);
+            1, 0L, blockSize, 0L, DataChecksum.newDataChecksum(metadataIn));
         blockSender.sendBlock(out, baseStream);
         blockSender.sendBlock(out, baseStream);
         
         
         LOG.info("Sent block " + block.getBlock() + " to " + datanode.name);
         LOG.info("Sent block " + block.getBlock() + " to " + datanode.name);