Author: sandy Date: Tue Oct 1 20:09:05 2013 New Revision: 1528200 URL: http://svn.apache.org/r1528200 Log: MAPREDUCE-5544. JobClient#getJob loads job conf twice. (Sandy Ryza)
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobClient.java Modified: hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1528200&r1=1528199&r2=1528200&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt Tue Oct 1 20:09:05 2013 @@ -67,6 +67,8 @@ Release 2.1.2 - UNRELEASED SequenceFileAsBinaryOutputFormat.WritableValueBytes by re-introducing missing constructors. (Zhijie Shen via acmurthy) + MAPREDUCE-5544. JobClient#getJob loads job conf twice. (Sandy Ryza) + Release 2.1.1-beta - 2013-09-23 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobClient.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobClient.java?rev=1528200&r1=1528199&r2=1528200&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobClient.java (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobClient.java Tue Oct 1 20:09:05 2013 @@ -173,7 +173,12 @@ public class JobClient extends CLI { * job completes.) */ public NetworkedJob(JobStatus status, Cluster cluster) throws IOException { - job = Job.getInstance(cluster, status, new JobConf(status.getJobFile())); + this(status, cluster, new JobConf(status.getJobFile())); + } + + private NetworkedJob(JobStatus status, Cluster cluster, JobConf conf) + throws IOException { + this(Job.getInstance(cluster, status, conf)); } public NetworkedJob(Job job) throws IOException { @@ -592,7 +597,8 @@ public class JobClient extends CLI { if (job != null) { JobStatus status = JobStatus.downgrade(job.getStatus()); if (status != null) { - return new NetworkedJob(status, cluster); + return new NetworkedJob(status, cluster, + new JobConf(job.getConfiguration())); } } } catch (InterruptedException ie) {