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

Fixed broken merge for MAPREDUCE-2987 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171924 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-09-17 07:16:47 +00:00
parent 148b5eeaa1
commit c09246b2e8
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java
View File

@ -27,7 +27,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configuration.IntegerRanges; import org.apache.hadoop.conf.Configuration.IntegerRanges;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.RawComparator; import org.apache.hadoop.io.RawComparator;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapreduce.InputFormat; import org.apache.hadoop.mapreduce.InputFormat;
import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.JobContext;
@ -61,11 +60,7 @@ public class JobContextImpl implements JobContext {
protected final Credentials credentials; protected final Credentials credentials;
public JobContextImpl(Configuration conf, JobID jobId) { public JobContextImpl(Configuration conf, JobID jobId) {
if (conf instanceof JobConf) { this.conf = new org.apache.hadoop.mapred.JobConf(conf);
this.conf = (JobConf)conf;
} else {
this.conf = new org.apache.hadoop.mapred.JobConf(conf);
}
this.jobId = jobId; this.jobId = jobId;
this.credentials = this.conf.getCredentials(); this.credentials = this.conf.getCredentials();
try { try {

13
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
View File

@ -223,10 +223,23 @@ public class YARNRunner implements ClientProtocol {
throw new YarnException(e); throw new YarnException(e);
} }
// XXX Remove
Path submitJobDir = new Path(jobSubmitDir);
FileContext defaultFS = FileContext.getFileContext(conf);
Path submitJobFile =
defaultFS.makeQualified(JobSubmissionFiles.getJobConfPath(submitJobDir));
FSDataInputStream in = defaultFS.open(submitJobFile);
conf.addResource(in);
// ---
// Construct necessary information to start the MR AM // Construct necessary information to start the MR AM
ApplicationSubmissionContext appContext = ApplicationSubmissionContext appContext =
createApplicationSubmissionContext(conf, jobSubmitDir, ts); createApplicationSubmissionContext(conf, jobSubmitDir, ts);
// XXX Remove
in.close();
// ---
// Submit to ResourceManager // Submit to ResourceManager
ApplicationId applicationId = resMgrDelegate.submitApplication(appContext); ApplicationId applicationId = resMgrDelegate.submitApplication(appContext);