svn commit: r1103986 - in /hadoop/mapreduce/branches/MR-279: ./ mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/

[mahadev]

Author: mahadev
Date: Tue May 17 02:20:49 2011
New Revision: 1103986

URL: http://svn.apache.org/viewvc?rev=1103986&view=rev
Log:
Make logging and memory for AM configurable for the user via command line 
(mahadev)

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/YARNApplicationConstants.java

Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1103986&r1=1103985&r2=1103986&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Tue May 17 02:20:49 2011
@@ -4,6 +4,9 @@ Trunk (unreleased changes)
 
   MAPREDUCE-279
 
+    Make logging and memory for AM configurable for the user via command 
+    line (mahadev) 
+
     Makes uber-task disabled by default (ddas)
     
     Fix CapacityScheduler (LeafQueue) to not allocate DATA_LOCAL containers

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=1103986&r1=1103985&r2=1103986&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
 Tue May 17 02:20:49 2011
@@ -89,7 +89,7 @@ public class YARNRunner implements Clien
 
   public static final String YARN_AM_VMEM_MB =
       "yarn.am.mapreduce.resource.mb";
-  private static final int DEFAULT_YARN_AM_VMEM_MB = 1536;
+  private static final int DEFAULT_YARN_AM_VMEM_MB = 2048;
   
   private final RecordFactory recordFactory = 
RecordFactoryProvider.getRecordFactory(null);
   private ResourceMgrDelegate resMgrDelegate;
@@ -321,8 +321,11 @@ public class YARNRunner implements Clien
     String javaHome = "$JAVA_HOME";
     Vector<CharSequence> vargs = new Vector<CharSequence>(8);
     vargs.add(javaHome + "/bin/java");
+    vargs.add("-Dhadoop.root.logger=" + 
conf.get(YARNApplicationConstants.MR_APPMASTER_LOG_OPTS,
+        YARNApplicationConstants.DEFAULT_MR_APPMASTER_LOG_OPTS) + ",console");
+    
     vargs.add(conf.get(YARNApplicationConstants.MR_APPMASTER_COMMAND_OPTS,
-        "-Dhadoop.root.logger=INFO,console -Xmx1024m"));
+        YARNApplicationConstants.DEFAULT_MR_APPMASTER_COMMAND_OPTS));
 
     // Add { job jar, MR app jar } to classpath.
     Map<String, String> environment = new HashMap<String, String>();

Modified: 
hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YARNApplicationConstants.java
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YARNApplicationConstants.java?rev=1103986&r1=1103985&r2=1103986&view=diff
==============================================================================
--- 
hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YARNApplicationConstants.java
 (original)
+++ 
hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YARNApplicationConstants.java
 Tue May 17 02:20:49 2011
@@ -49,6 +49,15 @@ public class YARNApplicationConstants {
   public static final String MR_APPMASTER_COMMAND_OPTS =
       "yarn.appMaster.commandOpts";
   
+  public static final String DEFAULT_MR_APPMASTER_COMMAND_OPTS =
+    "-Xmx1536m";
+  
+  public static final String MR_APPMASTER_LOG_OPTS =
+    "yarn.appMaster.logOpts";
+
+  public static final String DEFAULT_MR_APPMASTER_LOG_OPTS =
+    "INFO";
+  
   public static final String AM_RM_SCHEDULE_INTERVAL = 
     "yarn.appMaster.scheduler.interval";