svn commit: r807436 - in /hadoop/hdfs/branches/HDFS-265: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java

[hairong]

Author: hairong
Date: Tue Aug 25 00:17:09 2009
New Revision: 807436

URL: http://svn.apache.org/viewvc?rev=807436&view=rev
Log:
merge -r 807432:807431 to revert the change made to the append branch by 
HDFS-553

Modified:
    hadoop/hdfs/branches/HDFS-265/CHANGES.txt
    
hadoop/hdfs/branches/HDFS-265/src/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java

Modified: hadoop/hdfs/branches/HDFS-265/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-265/CHANGES.txt?rev=807436&r1=807435&r2=807436&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-265/CHANGES.txt (original)
+++ hadoop/hdfs/branches/HDFS-265/CHANGES.txt Tue Aug 25 00:17:09 2009
@@ -166,9 +166,6 @@
     HDFS-547. TestHDFSFileSystemContract#testOutputStreamClosedTwice
     sometimes fails with CloseByInterruptException. (hairong)
 
-    HDFS-553. BlockSender reports wrong failed position in ChecksumException.
-    (hairong)
-
 Release 0.20.1 - Unreleased
 
   IMPROVEMENTS

Modified: 
hadoop/hdfs/branches/HDFS-265/src/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-265/src/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java?rev=807436&r1=807435&r2=807436&view=diff
==============================================================================
--- 
hadoop/hdfs/branches/HDFS-265/src/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
 (original)
+++ 
hadoop/hdfs/branches/HDFS-265/src/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
 Tue Aug 25 00:17:09 2009
@@ -290,9 +290,8 @@
           int dLen = Math.min(dLeft, bytesPerChecksum);
           checksum.update(buf, dOff, dLen);
           if (!checksum.compare(buf, cOff)) {
-            long failedPos = offset + len -dLeft;
             throw new ChecksumException("Checksum failed at " + 
-                                        failedPos, failedPos);
+                                        (offset + len - dLeft), len);
           }
           dLeft -= dLen;
           dOff += dLen;