hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r1133262 - in /hadoop/mapreduce/branches/MR-279: CHANGES.txt mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
Date Wed, 08 Jun 2011 07:13:36 GMT
Author: mahadev
Date: Wed Jun  8 07:13:35 2011
New Revision: 1133262

URL: http://svn.apache.org/viewvc?rev=1133262&view=rev
Log:
MAPREDUCE-2566. YarnConfiguration should reloadConfiguration if instantiated with a non YarnConfiguration
object. (siddharth seth)

Modified:
    hadoop/mapreduce/branches/MR-279/CHANGES.txt
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java

Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1133262&r1=1133261&r2=1133262&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Wed Jun  8 07:13:35 2011
@@ -4,6 +4,9 @@ Trunk (unreleased changes)
 
 
     MAPREDUCE-279
+   
+    MAPREDUCE-2566. YarnConfiguration should reloadConfiguration if 
+    instantiated with a non YarnConfiguration object. (siddharth seth)
 
     Work around broken signaling in public cache. (cdouglas)
 

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java?rev=1133262&r1=1133261&r2=1133262&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java
Wed Jun  8 07:13:35 2011
@@ -107,10 +107,10 @@ public class YARNRunner implements Clien
   public YARNRunner(Configuration conf) {
     this.conf = new YarnConfiguration(conf);
     try {
-      this.resMgrDelegate = new ResourceMgrDelegate(conf);
-      this.clientServiceDelegate = new ClientServiceDelegate(conf,
+      this.resMgrDelegate = new ResourceMgrDelegate(this.conf);
+      this.clientServiceDelegate = new ClientServiceDelegate(this.conf,
           resMgrDelegate);
-      this.defaultFileContext = FileContext.getFileContext(conf);
+      this.defaultFileContext = FileContext.getFileContext(this.conf);
     } catch (UnsupportedFileSystemException ufe) {
       throw new RuntimeException("Error in instantiating YarnClient", ufe);
     }

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java?rev=1133262&r1=1133261&r2=1133262&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
Wed Jun  8 07:13:35 2011
@@ -74,6 +74,9 @@ public class YarnConfiguration extends C
   
   public YarnConfiguration(Configuration conf) {
     super(conf);
+    if (! (conf instanceof YarnConfiguration)) {
+      this.reloadConfiguration();
+    }
   }
 
   public static String getRMWebAppURL(Configuration conf) {



Mime
View raw message