Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-2805. Update RAID for HDFS-2241. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1156513 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2011-08-11 07:09:27 +00:00
parent 6a7c0306bd
commit 5b7c0b6a45
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mapreduce/CHANGES.txt
View File

@ -383,6 +383,8 @@ Trunk (unreleased changes)
MAPREDUCE-2797. Update mapreduce tests and RAID for HDFS-2239. (szetszwo) MAPREDUCE-2797. Update mapreduce tests and RAID for HDFS-2239. (szetszwo)
MAPREDUCE-2805. Update RAID for HDFS-2241. (szetszwo)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
mapreduce/src/contrib/raid/src/java/org/apache/hadoop/hdfs/server/datanode/RaidBlockSender.java
View File

@ -41,7 +41,7 @@
/** /**
* Reads a block from the disk and sends it to a recipient. * 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; public static final Log LOG = DataNode.LOG;
static final Log ClientTraceLog = DataNode.ClientTraceLog; static final Log ClientTraceLog = DataNode.ClientTraceLog;
@ -389,7 +389,7 @@ public long sendBlock(DataOutputStream out, OutputStream baseStream)
streamForSendChunks = baseStream; streamForSendChunks = baseStream;
// assure a mininum buffer size. // assure a mininum buffer size.
maxChunksPerPacket = (Math.max(BUFFER_SIZE, maxChunksPerPacket = (Math.max(FSConstants.IO_FILE_BUFFER_SIZE,
MIN_BUFFER_WITH_TRANSFERTO) MIN_BUFFER_WITH_TRANSFERTO)
+ bytesPerChecksum - 1)/bytesPerChecksum; + bytesPerChecksum - 1)/bytesPerChecksum;
@ -397,7 +397,7 @@ public long sendBlock(DataOutputStream out, OutputStream baseStream)
pktSize += checksumSize * maxChunksPerPacket; pktSize += checksumSize * maxChunksPerPacket;
} else { } else {
maxChunksPerPacket = Math.max(1, maxChunksPerPacket = Math.max(1,
(BUFFER_SIZE + bytesPerChecksum - 1)/bytesPerChecksum); (FSConstants.IO_FILE_BUFFER_SIZE + bytesPerChecksum - 1)/bytesPerChecksum);
pktSize += (bytesPerChecksum + checksumSize) * maxChunksPerPacket; pktSize += (bytesPerChecksum + checksumSize) * maxChunksPerPacket;
} }