You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2008/10/22 00:19:08 UTC
svn commit: r706798 - in /hadoop/core/branches/branch-0.19: ./ CHANGES.txt
src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
Author: hairong
Date: Tue Oct 21 15:19:07 2008
New Revision: 706798
URL: http://svn.apache.org/viewvc?rev=706798&view=rev
Log:
Merge -r 706795:706796 from trunk to main to move the change log of HADOOP-3914.
Modified:
hadoop/core/branches/branch-0.19/ (props changed)
hadoop/core/branches/branch-0.19/CHANGES.txt
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
Propchange: hadoop/core/branches/branch-0.19/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 21 15:19:07 2008
@@ -1 +1 @@
-/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719
+/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796
Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=706798&r1=706797&r2=706798&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Tue Oct 21 15:19:07 2008
@@ -984,6 +984,9 @@
HADOOP-4469. Rename and add the ant task jar file to the tar file. (nigel)
+ HADOOP-3914. DFSClient sends Checksum Ok only once for a block.
+ (Christain Kunz via hairong)
+
Release 0.18.1 - 2008-09-17
IMPROVEMENTS
Modified: hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?rev=706798&r1=706797&r2=706798&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java (original)
+++ hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java Tue Oct 21 15:19:07 2008
@@ -1024,6 +1024,7 @@
private int bytesPerChecksum;
private int checksumSize;
private boolean gotEOS = false;
+ private boolean sentChecksumOk = false;
byte[] skipBuf = null;
ByteBuffer checksumBytes = null;
@@ -1058,8 +1059,15 @@
int nRead = super.read(buf, off, len);
if (nRead >= 0 && gotEOS && needChecksum()) {
- //checksum is verified and there are no errors.
- checksumOk(dnSock);
+ if (sentChecksumOk) {
+ // this should not happen; log the error for the debugging purpose
+ LOG.info(StringUtils.stringifyException(new IOException(
+ "Checksum ok was sent and should not be sent again")));
+ } else {
+ //checksum is verified and there are no errors.
+ checksumOk(dnSock);
+ sentChecksumOk = true;
+ }
}
return nRead;
}