From d09e2475b61bae3d446be2ed89109106707aac25 Mon Sep 17 00:00:00 2001
From: Tsz-wo Sze <szetszwo@apache.org>
Date: Fri, 24 Jun 2011 18:21:55 +0000
Subject: [PATCH] MAPREDUCE-2620. Update RAID for HDFS-2087.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1139400 13f79535-47bb-0310-9956-ffa450edef68
---
 mapreduce/CHANGES.txt                                     | 2 ++
 .../raid/src/java/org/apache/hadoop/raid/BlockFixer.java  | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mapreduce/CHANGES.txt b/mapreduce/CHANGES.txt
index 75c454e914..5530edb0f5 100644
--- a/mapreduce/CHANGES.txt
+++ b/mapreduce/CHANGES.txt
@@ -310,6 +310,8 @@ Trunk (unreleased changes)
     MAPREDUCE-2550. Fix bin/mapred to work properly from within a source
     checkout (Eric Yang via todd)
 
+    MAPREDUCE-2620. Update RAID for HDFS-2087.  (szetszwo)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/mapreduce/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java b/mapreduce/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java
index eaa960a92e..56ca58ebbe 100644
--- a/mapreduce/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java
+++ b/mapreduce/src/contrib/raid/src/java/org/apache/hadoop/raid/BlockFixer.java
@@ -780,11 +780,9 @@ private void sendFixedBlock(DatanodeInfo datanode,
                               });
         
         DatanodeInfo[] nodes = new DatanodeInfo[]{datanode};
-        Sender.opWriteBlock(out, block.getBlock(), 1,
-                                                 BlockConstructionStage.
-                                                 PIPELINE_SETUP_CREATE,
-                                                 0, blockSize, 0, "", null,
-                                                 nodes, block.getBlockToken());
+        new Sender(out).writeBlock(block.getBlock(), block.getBlockToken(), "",
+            nodes, null, BlockConstructionStage.PIPELINE_SETUP_CREATE,
+            1, 0L, blockSize, 0L);
         blockSender.sendBlock(out, baseStream);
         
         LOG.info("Sent block " + block.getBlock() + " to " + datanode.name);