From 05ff54c66c49301c4ec2549704d9d459e784572c Mon Sep 17 00:00:00 2001 From: Devaraj K Date: Thu, 14 May 2015 22:09:54 +0530 Subject: [PATCH] MAPREDUCE-5708. Duplicate String.format in YarnOutputFiles.getSpillFileForWrite. Contributed by Konstantin Weitz. --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/mapred/YarnOutputFiles.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 7fe8483b088..bc1f4278905 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -422,6 +422,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 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 e08e0931803..e099b8f2174 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 Path getSpillFile(int spillNumber) throws IOException { 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); } /**