From 590ff92e7a6f8e143c18f6f16672ce5fb7315ea2 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Mon, 10 Oct 2011 03:30:24 +0000 Subject: [PATCH] Merge -c 1180774 from trunk to branch-0.23 to fix MAPREDUCE-3154. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180775 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/mapreduce/JobSubmitter.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index dc9a4fd9c81..7a702ce5f68 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1521,6 +1521,9 @@ Release 0.23.0 - Unreleased MAPREDUCE-3123. Fix NM to quote symlink names to escape special characters. (Hitesh Shah via acmurthy) + MAPREDUCE-3154. Fix JobSubmitter to check for output specs before copying + job submission files to fail fast. (Abhijit Suresh Shingate via acmurthy) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java index 2224cb967f5..0451a0df421 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java @@ -322,6 +322,9 @@ class JobSubmitter { JobStatus submitJobInternal(Job job, Cluster cluster) throws ClassNotFoundException, InterruptedException, IOException { + //validate the jobs output specs + checkSpecs(job); + Path jobStagingArea = JobSubmissionFiles.getStagingDir(cluster, job.getConfiguration()); //configure the command line options correctly on the submitting dfs @@ -350,8 +353,6 @@ class JobSubmitter { copyAndConfigureFiles(job, submitJobDir); Path submitJobFile = JobSubmissionFiles.getJobConfPath(submitJobDir); - checkSpecs(job); - // Create the splits for the job LOG.debug("Creating splits at " + jtFs.makeQualified(submitJobDir)); int maps = writeSplits(job, submitJobDir);