Author: sseth
Date: Fri Aug 31 20:20:05 2012
New Revision: 1379581
URL: http://svn.apache.org/viewvc?rev=1379581&view=rev
Log:
MAPREDUCE-4609. RMContainerAllocator scheduler interval should be configurable.
(Contributed by Tsuyoshi OZAWA)
Modified:
hadoop/common/branches/MR-3902/hadoop-mapreduce-project/CHANGES.txt.MR-3902
hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app2/src/main/java/org/apache/hadoop/mapreduce/v2/app2/rm/RMContainerAllocator.java
hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
Modified:
hadoop/common/branches/MR-3902/hadoop-mapreduce-project/CHANGES.txt.MR-3902
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-mapreduce-project/CHANGES.txt.MR-3902?rev=1379581&r1=1379580&r2=1379581&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/hadoop-mapreduce-project/CHANGES.txt.MR-3902
(original)
+++ hadoop/common/branches/MR-3902/hadoop-mapreduce-project/CHANGES.txt.MR-3902
Fri Aug 31 20:20:05 2012
@@ -4,3 +4,5 @@ Branch MR-3902
MAPREDUCE-4602. Re-create ask list correctly in case of a temporary error in
the AM-RM allocate call (sseth)
MAPREDUCE-4599. Prevent contianer launches on blacklisted hosts. (Tsuyoshi
OZAWA via sseth)
+
+ MAPREDUCE-4609. RMContainerAllocator scheduler interval should be
configurable. (Tsuyoshi OZAWA via sseth)
Modified:
hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app2/src/main/java/org/apache/hadoop/mapreduce/v2/app2/rm/RMContainerAllocator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app2/src/main/java/org/apache/hadoop/mapreduce/v2/app2/rm/RMContainerAllocator.java?rev=1379581&r1=1379580&r2=1379581&view=diff
==============================================================================
---
hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app2/src/main/java/org/apache/hadoop/mapreduce/v2/app2/rm/RMContainerAllocator.java
(original)
+++
hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app2/src/main/java/org/apache/hadoop/mapreduce/v2/app2/rm/RMContainerAllocator.java
Fri Aug 31 20:20:05 2012
@@ -207,6 +207,9 @@ public class RMContainerAllocator extend
maxReducePreemptionLimit = conf.getFloat(
MRJobConfig.MR_AM_JOB_REDUCE_PREEMPTION_LIMIT,
MRJobConfig.DEFAULT_MR_AM_JOB_REDUCE_PREEMPTION_LIMIT);
+ scheduleInterval = conf.getLong(
+ MRJobConfig.MR_AM_SCHEDULER_INTERVAL,
+ MRJobConfig.DEFAULT_MR_AM_SCHEDULER_INTERVAL);
shouldReUse = conf.getBoolean("am.scheduler.shouldReuse", false);
LOG.info("XXX: ShouldReUse: " + shouldReUse);
RackResolver.init(conf);
Modified:
hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java?rev=1379581&r1=1379580&r2=1379581&view=diff
==============================================================================
---
hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
(original)
+++
hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
Fri Aug 31 20:20:05 2012
@@ -443,6 +443,12 @@ public interface MRJobConfig {
public static final String MR_AM_TASK_LISTENER_THREAD_COUNT =
MR_AM_PREFIX + "job.task.listener.thread-count";
public static final int DEFAULT_MR_AM_TASK_LISTENER_THREAD_COUNT = 30;
+
+ /** How often the AM should schedule assigning tasks with allocated
+ * containers.*/
+ public static final String MR_AM_SCHEDULER_INTERVAL =
+ MR_AM_PREFIX + "scheduler.interval-ms";
+ public static final long DEFAULT_MR_AM_SCHEDULER_INTERVAL = 1000l;
/** How often the AM should send heartbeats to the RM.*/
public static final String MR_AM_TO_RM_HEARTBEAT_INTERVAL_MS =
