Author: szetszwo
Date: Thu Aug 11 07:09:27 2011
New Revision: 1156513
URL: http://svn.apache.org/viewvc?rev=1156513&view=rev
Log:
MAPREDUCE-2805. Update RAID for HDFS-2241.
Modified:
hadoop/common/trunk/mapreduce/CHANGES.txt
hadoop/common/trunk/mapreduce/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java
Modified: hadoop/common/trunk/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/CHANGES.txt?rev=1156513&r1=1156512&r2=1156513&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/CHANGES.txt (original)
+++ hadoop/common/trunk/mapreduce/CHANGES.txt Thu Aug 11 07:09:27 2011
@@ -383,6 +383,8 @@ Trunk (unreleased changes)
MAPREDUCE-2797. Update mapreduce tests and RAID for HDFS-2239. (szetszwo)
+ MAPREDUCE-2805. Update RAID for HDFS-2241. (szetszwo)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/mapreduce/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java?rev=1156513&r1=1156512&r2=1156513&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java
(original)
+++ hadoop/common/trunk/mapreduce/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java
Thu Aug 11 07:09:27 2011
@@ -41,7 +41,7 @@ import org.apache.hadoop.util.StringUtil
/**
* Reads a block from the disk and sends it to a recipient.
*/
-public class RaidBlockSender implements java.io.Closeable, FSConstants {
+public class RaidBlockSender implements java.io.Closeable {
public static final Log LOG = DataNode.LOG;
static final Log ClientTraceLog = DataNode.ClientTraceLog;
@@ -389,7 +389,7 @@ public class RaidBlockSender implements
streamForSendChunks = baseStream;
// assure a mininum buffer size.
- maxChunksPerPacket = (Math.max(BUFFER_SIZE,
+ maxChunksPerPacket = (Math.max(FSConstants.IO_FILE_BUFFER_SIZE,
MIN_BUFFER_WITH_TRANSFERTO)
+ bytesPerChecksum - 1)/bytesPerChecksum;
@@ -397,7 +397,7 @@ public class RaidBlockSender implements
pktSize += checksumSize * maxChunksPerPacket;
} else {
maxChunksPerPacket = Math.max(1,
- (BUFFER_SIZE + bytesPerChecksum - 1)/bytesPerChecksum);
+ (FSConstants.IO_FILE_BUFFER_SIZE + bytesPerChecksum - 1)/bytesPerChecksum);
pktSize += (bytesPerChecksum + checksumSize) * maxChunksPerPacket;
}
|