From e7ec8a44b6cde2a6c6c93703afe41fea9a902b34 Mon Sep 17 00:00:00 2001
From: Robert Joseph Evans <bobby@apache.org>
Date: Mon, 26 Mar 2012 21:25:16 +0000
Subject: [PATCH] svn merge -c 1305607 trunk to branch-0.23 FIXES:
 MAPREDUCE-4061. RM only has 1 AM launcher thread (tgraves via bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305608 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                            | 2 ++
 .../hadoop/mapreduce/v2/app/taskclean/TaskCleanerImpl.java      | 2 +-
 .../resourcemanager/amlauncher/ApplicationMasterLauncher.java   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 43967584977..67669e2fbe6 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -261,6 +261,8 @@ Release 0.23.2 - UNRELEASED
     MAPREDUCE-4006. History server container log web UI sometimes combines
     stderr/stdout/syslog contents together (Siddharth Seth via tgraves)
 
+    MAPREDUCE-4061. RM only has 1 AM launcher thread (tgraves via bobby)
+
 Release 0.23.1 - 2012-02-17
 
   NEW FEATURES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/taskclean/TaskCleanerImpl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/taskclean/TaskCleanerImpl.java
index da5a342a2ee..8ee1d6e2eae 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/taskclean/TaskCleanerImpl.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/taskclean/TaskCleanerImpl.java
@@ -53,7 +53,7 @@ public class TaskCleanerImpl extends AbstractService implements TaskCleaner {
     ThreadFactory tf = new ThreadFactoryBuilder()
       .setNameFormat("TaskCleaner #%d")
       .build();
-    launcherPool = new ThreadPoolExecutor(1, 5, 1, 
+    launcherPool = new ThreadPoolExecutor(5, 5, 1, 
         TimeUnit.HOURS, new LinkedBlockingQueue<Runnable>(), tf);
     eventHandlingThread = new Thread(new Runnable() {
       @Override
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java
index d901196f55e..b618e65f8f9 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java
@@ -52,7 +52,7 @@ public class ApplicationMasterLauncher extends AbstractService implements
       RMContext context) {
     super(ApplicationMasterLauncher.class.getName());
     this.context = context;
-    this.launcherPool = new ThreadPoolExecutor(1, 10, 1, 
+    this.launcherPool = new ThreadPoolExecutor(10, 10, 1, 
         TimeUnit.HOURS, new LinkedBlockingQueue<Runnable>());
     this.launcherHandlingThread = new LauncherThread();
     this.applicationTokenSecretManager = applicationTokenSecretManager;