Author: acmurthy Date: Sat Sep 17 05:53:28 2011 New Revision: 1171902 URL: http://svn.apache.org/viewvc?rev=1171902&view=rev Log: Merge -r 1171900:1171901 from trunk to branch-0.23 to fix MAPREDUCE-2987.
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HeaderBlock.java Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1171902&r1=1171901&r2=1171902&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Sat Sep 17 05:53:28 2011 @@ -1304,6 +1304,9 @@ Release 0.23.0 - Unreleased MAPREDUCE-3007. Fixed Yarn Mapreduce client to be able to connect to JobHistoryServer in secure mode. (vinodkv) + MAPREDUCE-2987. Fixed display of logged user on RM Web-UI. (Thomas Graves + via acmurthy) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java?rev=1171902&r1=1171901&r2=1171902&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java Sat Sep 17 05:53:28 2011 @@ -27,6 +27,7 @@ import org.apache.hadoop.conf.Configurat import org.apache.hadoop.conf.Configuration.IntegerRanges; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.RawComparator; +import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapreduce.InputFormat; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.JobContext; @@ -60,7 +61,11 @@ public class JobContextImpl implements J protected final Credentials credentials; public JobContextImpl(Configuration conf, JobID jobId) { - this.conf = new org.apache.hadoop.mapred.JobConf(conf); + if (conf instanceof JobConf) { + this.conf = (JobConf)conf; + } else { + this.conf = new org.apache.hadoop.mapred.JobConf(conf); + } this.jobId = jobId; this.credentials = this.conf.getCredentials(); try { Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java?rev=1171902&r1=1171901&r2=1171902&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java Sat Sep 17 05:53:28 2011 @@ -223,23 +223,10 @@ public class YARNRunner implements Clien 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 ApplicationSubmissionContext appContext = createApplicationSubmissionContext(conf, jobSubmitDir, ts); - // XXX Remove - in.close(); - // --- - // Submit to ResourceManager ApplicationId applicationId = resMgrDelegate.submitApplication(appContext); Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HeaderBlock.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HeaderBlock.java?rev=1171902&r1=1171901&r2=1171902&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HeaderBlock.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HeaderBlock.java Sat Sep 17 05:53:28 2011 @@ -23,10 +23,14 @@ import static org.apache.hadoop.yarn.web public class HeaderBlock extends HtmlBlock { @Override protected void render(Block html) { + String loggedIn = ""; + if (request().getRemoteUser() != null) { + loggedIn = "Logged in as: " + request().getRemoteUser(); + } html. div("#header.ui-widget"). div("#user"). - _("Logged in as: "+ request().getRemoteUser())._(). + _(loggedIn)._(). div("#logo"). img("/static/hadoop-st.png")._(). h1($(TITLE))._();