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
This commit is contained in:
Robert Joseph Evans 2012-03-26 21:25:16 +00:00
parent 6fc0b02fd4
commit e7ec8a44b6
3 changed files with 4 additions and 2 deletions

View File

@ -261,6 +261,8 @@ Release 0.23.2 - UNRELEASED
MAPREDUCE-4006. History server container log web UI sometimes combines MAPREDUCE-4006. History server container log web UI sometimes combines
stderr/stdout/syslog contents together (Siddharth Seth via tgraves) 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 Release 0.23.1 - 2012-02-17
NEW FEATURES NEW FEATURES

View File

@ -53,7 +53,7 @@ public class TaskCleanerImpl extends AbstractService implements TaskCleaner {
ThreadFactory tf = new ThreadFactoryBuilder() ThreadFactory tf = new ThreadFactoryBuilder()
.setNameFormat("TaskCleaner #%d") .setNameFormat("TaskCleaner #%d")
.build(); .build();
launcherPool = new ThreadPoolExecutor(1, 5, 1, launcherPool = new ThreadPoolExecutor(5, 5, 1,
TimeUnit.HOURS, new LinkedBlockingQueue<Runnable>(), tf); TimeUnit.HOURS, new LinkedBlockingQueue<Runnable>(), tf);
eventHandlingThread = new Thread(new Runnable() { eventHandlingThread = new Thread(new Runnable() {
@Override @Override

View File

@ -52,7 +52,7 @@ public class ApplicationMasterLauncher extends AbstractService implements
RMContext context) { RMContext context) {
super(ApplicationMasterLauncher.class.getName()); super(ApplicationMasterLauncher.class.getName());
this.context = context; this.context = context;
this.launcherPool = new ThreadPoolExecutor(1, 10, 1, this.launcherPool = new ThreadPoolExecutor(10, 10, 1,
TimeUnit.HOURS, new LinkedBlockingQueue<Runnable>()); TimeUnit.HOURS, new LinkedBlockingQueue<Runnable>());
this.launcherHandlingThread = new LauncherThread(); this.launcherHandlingThread = new LauncherThread();
this.applicationTokenSecretManager = applicationTokenSecretManager; this.applicationTokenSecretManager = applicationTokenSecretManager;