Author: acmurthy
Date: Sun May 15 08:04:59 2011
New Revision: 1103293
URL: http://svn.apache.org/viewvc?rev=1103293&view=rev
Log:
Speed up communication between MR AM and RM by relying on a new config rather
than AM_EXPIRY_INTERVAL which is too large.
Modified:
hadoop/mapreduce/branches/MR-279/CHANGES.txt
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.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=1103293&r1=1103292&r2=1103293&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Sun May 15 08:04:59 2011
@@ -3,6 +3,10 @@ Hadoop MapReduce Change Log
Trunk (unreleased changes)
MAPREDUCE-279
+
+ Speed up communication between MR AM and RM by relying on a new config
+ rather than AM_EXPIRY_INTERVAL which is too large. (acmurthy)
+
Fix for clearing container requests on an AM failure and add tostring
methods
to taskids and taskattemptids for better grep support. (mahadev)
Modified:
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java?rev=1103293&r1=1103292&r2=1103293&view=diff
==============================================================================
---
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
(original)
+++
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
Sun May 15 08:04:59 2011
@@ -46,6 +46,7 @@ import org.apache.hadoop.yarn.api.record
import org.apache.hadoop.yarn.api.records.ApplicationStatus;
import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.ResourceRequest;
+import org.apache.hadoop.yarn.conf.YARNApplicationConstants;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.event.EventHandler;
import org.apache.hadoop.yarn.factories.RecordFactory;
@@ -84,7 +85,9 @@ public class RMCommunicator extends Abst
@Override
public void init(Configuration conf) {
super.init(conf);
- rmPollInterval = conf.getInt(YarnConfiguration.AM_EXPIRY_INTERVAL,
10000)/3;
+ rmPollInterval =
+ conf.getInt(YARNApplicationConstants.AM_RM_SCHEDULE_INTERVAL,
+ YARNApplicationConstants.DEFAULT_AM_RM_SCHEDULE_INTERVAL);
}
@Override
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=1103293&r1=1103292&r2=1103293&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
Sun May 15 08:04:59 2011
@@ -48,4 +48,9 @@ public class YARNApplicationConstants {
// TODO: Move into MR.
public static final String MR_APPMASTER_COMMAND_OPTS =
"yarn.appMaster.commandOpts";
+
+ public static final String AM_RM_SCHEDULE_INTERVAL =
+ "yarn.appMaster.scheduler.interval";
+
+ public static final int DEFAULT_AM_RM_SCHEDULE_INTERVAL = 2000;
}