Repository: hadoop Updated Branches: refs/heads/branch-2 4bbcffa51 -> 454236ec1
MAPREDUCE-5708. Duplicate String.format in YarnOutputFiles.getSpillFileForWrite. Contributed by Konstantin Weitz. (cherry picked from commit 05ff54c66c49301c4ec2549704d9d459e784572c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/454236ec Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/454236ec Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/454236ec Branch: refs/heads/branch-2 Commit: 454236ec19c29e9366882f501f67169b51424b3d Parents: 4bbcffa Author: Devaraj K <deva...@apache.org> Authored: Thu May 14 22:09:54 2015 +0530 Committer: Devaraj K <deva...@apache.org> Committed: Thu May 14 22:11:15 2015 +0530 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/mapred/YarnOutputFiles.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/454236ec/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 2885c0e..fd4cd72 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -164,6 +164,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6366. mapreduce.terasort.final.sync configuration in TeraSort doesn't work. (Takuya Fukudome via ozawa) + MAPREDUCE-5708. Duplicate String.format in YarnOutputFiles.getSpillFileForWrite. + (Konstantin Weitz via devaraj) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/454236ec/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnOutputFiles.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnOutputFiles.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnOutputFiles.java index e08e093..e099b8f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnOutputFiles.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnOutputFiles.java @@ -157,8 +157,8 @@ public class YarnOutputFiles extends MapOutputFile { public Path getSpillFileForWrite(int spillNumber, long size) throws IOException { return lDirAlloc.getLocalPathForWrite( - String.format(String.format(SPILL_FILE_PATTERN, - conf.get(JobContext.TASK_ATTEMPT_ID), spillNumber)), size, conf); + String.format(SPILL_FILE_PATTERN, + conf.get(JobContext.TASK_ATTEMPT_ID), spillNumber), size, conf); } /**
