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

MAPREDUCE-5170. Fixed a wrong log message in CombineFileInputFormat class. Contributed by Sangjin Lee. 

svn merge --ignore-ancestry -c 1526377 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526379 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2013-09-26 04:30:36 +00:00
parent 30c03cc118
commit 6e132b1a2b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -84,6 +84,9 @@ Release 2.1.2 - UNRELEASED
MAPREDUCE-5503. Fixed a test issue in TestMRJobClient. (Jian He via vinodkv) MAPREDUCE-5503. Fixed a test issue in TestMRJobClient. (Jian He via vinodkv)
MAPREDUCE-5170. Fixed a wrong log message in CombineFileInputFormat class.
(Sangjin Lee via vinodkv)
Release 2.1.1-beta - 2013-09-23 Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java
View File

@ -203,13 +203,13 @@ public abstract class CombineFileInputFormat<K, V>
maxSize); maxSize);
} }
if (minSizeRack != 0 && maxSize != 0 && minSizeRack > maxSize) { if (minSizeRack != 0 && maxSize != 0 && minSizeRack > maxSize) {
throw new IOException("Minimum split size per rack" + minSizeRack + throw new IOException("Minimum split size per rack " + minSizeRack +
" cannot be larger than maximum split size " + " cannot be larger than maximum split size " +
maxSize); maxSize);
} }
if (minSizeRack != 0 && minSizeNode > minSizeRack) { if (minSizeRack != 0 && minSizeNode > minSizeRack) {
throw new IOException("Minimum split size per node" + minSizeNode + throw new IOException("Minimum split size per node " + minSizeNode +
" cannot be smaller than minimum split " + " cannot be larger than minimum split " +
"size per rack " + minSizeRack); "size per rack " + minSizeRack);
} }