You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ac...@apache.org on 2011/05/25 12:16:33 UTC
svn commit: r1127461 - in /hadoop/mapreduce/branches/MR-279: ./
mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/
mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/
mr-client/hadoo...
Author: acmurthy
Date: Wed May 25 10:16:32 2011
New Revision: 1127461
URL: http://svn.apache.org/viewvc?rev=1127461&view=rev
Log:
Made number of RPC server threads configurable.
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/mapred/TaskAttemptListenerImpl.java
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/YarnMRJobConfig.java
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHConfig.java
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/TestRPCFactories.java
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcServerFactory.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/AvroYarnRPC.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NMConfig.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestRPCFactories.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/api/protocolrecords/impl/pb/TestPBLocalizerRPC.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMConfig.java
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/RMResourceTrackerImpl.java
Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Wed May 25 10:16:32 2011
@@ -4,6 +4,8 @@ Trunk (unreleased changes)
MAPREDUCE-279
+ Made number of RPC server threads configurable. (acmurthy)
+
Add public cache. (cdouglas)
MAPREDUCE-2534. Fix CI breaking hard coded version in jobclient pom.
Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java Wed May 25 10:16:32 2011
@@ -34,6 +34,7 @@ import org.apache.hadoop.ipc.RPC.Server;
import org.apache.hadoop.mapred.SortedRanges.Range;
import org.apache.hadoop.mapreduce.TypeConverter;
import org.apache.hadoop.mapreduce.security.token.JobTokenSecretManager;
+import org.apache.hadoop.mapreduce.v2.YarnMRJobConfig;
import org.apache.hadoop.mapreduce.v2.api.records.TaskType;
import org.apache.hadoop.mapreduce.v2.app.AppContext;
import org.apache.hadoop.mapreduce.v2.app.TaskAttemptListener;
@@ -100,7 +101,9 @@ public class TaskAttemptListenerImpl ext
Configuration conf = getConfig();
try {
server =
- RPC.getServer(TaskUmbilicalProtocol.class, this, "0.0.0.0", 0, 1,
+ RPC.getServer(TaskUmbilicalProtocol.class, this, "0.0.0.0", 0,
+ conf.getInt(YarnMRJobConfig.AM_TASK_LISTENER_THREADS,
+ YarnMRJobConfig.DEFAULT_AM_TASK_LISTENER_THREADS),
false, conf, jobTokenSecretManager);
server.start();
InetSocketAddress listenerAddress = server.getListenerAddress();
Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.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/client/MRClientService.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java Wed May 25 10:16:32 2011
@@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.mapreduce.JobACL;
+import org.apache.hadoop.mapreduce.v2.YarnMRJobConfig;
import org.apache.hadoop.mapreduce.v2.api.MRClientProtocol;
import org.apache.hadoop.mapreduce.v2.api.protocolrecords.FailTaskAttemptRequest;
import org.apache.hadoop.mapreduce.v2.api.protocolrecords.FailTaskAttemptResponse;
@@ -136,7 +137,9 @@ public class MRClientService extends Abs
}
server =
rpc.getServer(MRClientProtocol.class, protocolHandler, address,
- conf, secretManager);
+ conf, secretManager,
+ conf.getInt(YarnMRJobConfig.AM_JOB_CLIENT_THREADS,
+ YarnMRJobConfig.DEFAULT_AM_JOB_CLIENT_THREADS));
server.start();
this.bindAddress =
NetUtils.createSocketAddr(hostNameResolved.getHostAddress()
Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/YarnMRJobConfig.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/YarnMRJobConfig.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/YarnMRJobConfig.java (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/YarnMRJobConfig.java Wed May 25 10:16:32 2011
@@ -25,16 +25,25 @@ import org.apache.hadoop.classification.
@InterfaceAudience.Private
@InterfaceStability.Evolving
public class YarnMRJobConfig {
+ public static final String YARN_MR_PREFIX = "yarn.mapreduce.job.";
public static final String SPECULATOR_CLASS
- = "yarn.mapreduce.job.speculator.class";
+ = YARN_MR_PREFIX + "speculator.class";
public static final String TASK_RUNTIME_ESTIMATOR_CLASS
- = "yarn.mapreduce.job.task.runtime.estimator.class";
+ = YARN_MR_PREFIX + "task.runtime.estimator.class";
public static final String TASK_ATTEMPT_PROGRESS_RUNTIME_LINEARIZER_CLASS
- = "yarn.mapreduce.job.task.runtime.linearizer.class";
+ = YARN_MR_PREFIX + "task.runtime.linearizer.class";
public static final String EXPONENTIAL_SMOOTHING_LAMBDA_MILLISECONDS
- = "yarn.mapreduce.job.task.runtime.estimator.exponential.smooth.lambda";
+ = YARN_MR_PREFIX + "task.runtime.estimator.exponential.smooth.lambda";
public static final String EXPONENTIAL_SMOOTHING_SMOOTH_RATE
- = "yarn.mapreduce.job.task.runtime.estimator.exponential.smooth.smoothsrate";
+ = YARN_MR_PREFIX + "task.runtime.estimator.exponential.smooth.smoothsrate";
public static final String RECOVERY_ENABLE
- = "yarn.mapreduce.job.recovery.enable";
+ = YARN_MR_PREFIX + "recovery.enable";
+
+ public static final String AM_TASK_LISTENER_THREADS =
+ YARN_MR_PREFIX + "task.listener.threads";
+ public static final int DEFAULT_AM_TASK_LISTENER_THREADS = 10;
+
+ public static final String AM_JOB_CLIENT_THREADS =
+ YARN_MR_PREFIX + "job.client.threads";
+ public static final int DEFAULT_AM_JOB_CLIENT_THREADS = 1;
}
Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHConfig.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHConfig.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHConfig.java (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHConfig.java Wed May 25 10:16:32 2011
@@ -90,4 +90,8 @@ public class JHConfig {
"address.webapp";
public static final String DEFAULT_HS_WEBAPP_BIND_ADDRESS =
"0.0.0.0:19888";
+
+ public static final String HS_CLIENT_THREADS =
+ HS_PREFIX + "client.threads";
+ public static final int DEFAULT_HS_CLIENT_THREADS = 10;
}
Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/TestRPCFactories.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/TestRPCFactories.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/TestRPCFactories.java (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/TestRPCFactories.java Wed May 25 10:16:32 2011
@@ -56,7 +56,9 @@ public class TestRPCFactories {
MRClientProtocol instance = new MRClientProtocolTestImpl();
Server server = null;
try {
- server = RpcServerFactoryPBImpl.get().getServer(MRClientProtocol.class, instance, addr, conf, null);
+ server =
+ RpcServerFactoryPBImpl.get().getServer(
+ MRClientProtocol.class, instance, addr, conf, null, 1);
server.start();
} catch (YarnException e) {
e.printStackTrace();
@@ -74,7 +76,9 @@ public class TestRPCFactories {
MRClientProtocol instance = new MRClientProtocolTestImpl();
Server server = null;
try {
- server = RpcServerFactoryPBImpl.get().getServer(MRClientProtocol.class, instance, addr, conf, null);
+ server =
+ RpcServerFactoryPBImpl.get().getServer(
+ MRClientProtocol.class, instance, addr, conf, null, 1);
server.start();
System.err.println(server.getListenerAddress());
System.err.println(NetUtils.getConnectAddress(server));
Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java Wed May 25 10:16:32 2011
@@ -119,7 +119,9 @@ public class HistoryClientService extend
//TODO: security
server =
rpc.getServer(MRClientProtocol.class, protocolHandler, address,
- conf, null);
+ conf, null,
+ conf.getInt(JHConfig.HS_CLIENT_THREADS,
+ JHConfig.DEFAULT_HS_CLIENT_THREADS));
server.start();
this.bindAddress =
NetUtils.createSocketAddr(hostNameResolved.getHostAddress()
Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java Wed May 25 10:16:32 2011
@@ -177,7 +177,7 @@ public class TestClientRedirect {
YarnRPC rpc = YarnRPC.create(getConfig());
Configuration clientServerConf = new Configuration(getConfig());
this.server = rpc.getServer(ClientRMProtocol.class, this,
- clientBindAddress, clientServerConf, null);
+ clientBindAddress, clientServerConf, null, 1);
this.server.start();
super.start();
}
@@ -296,7 +296,7 @@ public class TestClientRedirect {
server =
rpc.getServer(MRClientProtocol.class, this, address,
- conf, null);
+ conf, null, 1);
server.start();
this.bindAddress =
NetUtils.createSocketAddr(hostNameResolved.getHostAddress()
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcServerFactory.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcServerFactory.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcServerFactory.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcServerFactory.java Wed May 25 10:16:32 2011
@@ -12,6 +12,7 @@ public interface RpcServerFactory {
public Server getServer(Class<?> protocol, Object instance,
InetSocketAddress addr, Configuration conf,
- SecretManager<? extends TokenIdentifier> secretManager)
+ SecretManager<? extends TokenIdentifier> secretManager,
+ int numHandlers)
throws YarnException;
}
\ No newline at end of file
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java Wed May 25 10:16:32 2011
@@ -61,7 +61,7 @@ public class RpcServerFactoryPBImpl impl
@Override
public Server getServer(Class<?> protocol, Object instance,
InetSocketAddress addr, Configuration conf,
- SecretManager<? extends TokenIdentifier> secretManager)
+ SecretManager<? extends TokenIdentifier> secretManager, int numHandlers)
throws YarnException {
Constructor<?> constructor = serviceCache.get(protocol);
@@ -115,7 +115,8 @@ public class RpcServerFactoryPBImpl impl
}
try {
- return createServer(addr, conf, secretManager, (BlockingService)method.invoke(null, service));
+ return createServer(addr, conf, secretManager, numHandlers,
+ (BlockingService)method.invoke(null, service));
} catch (InvocationTargetException e) {
throw new YarnException(e);
} catch (IllegalAccessException e) {
@@ -147,9 +148,13 @@ public class RpcServerFactoryPBImpl impl
return clazz.getPackage().getName();
}
- private Server createServer(InetSocketAddress addr, Configuration conf, SecretManager<? extends TokenIdentifier> secretManager, BlockingService blockingService) throws IOException {
+ private Server createServer(InetSocketAddress addr, Configuration conf,
+ SecretManager<? extends TokenIdentifier> secretManager, int numHandlers,
+ BlockingService blockingService) throws IOException {
RPC.setProtocolEngine(conf, BlockingService.class, ProtoOverHadoopRpcEngine.class);
- Server server = RPC.getServer(BlockingService.class, blockingService, addr.getHostName(), addr.getPort(), 1, false, conf, secretManager);
+ Server server = RPC.getServer(BlockingService.class, blockingService,
+ addr.getHostName(), addr.getPort(), numHandlers, false, conf,
+ secretManager);
return server;
}
}
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/AvroYarnRPC.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/AvroYarnRPC.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/AvroYarnRPC.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/AvroYarnRPC.java Wed May 25 10:16:32 2011
@@ -50,7 +50,8 @@ public class AvroYarnRPC extends YarnRPC
@Override
public Server getServer(Class protocol, Object instance,
InetSocketAddress addr, Configuration conf,
- SecretManager<? extends TokenIdentifier> secretManager) {
+ SecretManager<? extends TokenIdentifier> secretManager,
+ int numHandlers) {
try {
return new SocketServer(new SpecificResponder(protocol, instance),
addr);
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java Wed May 25 10:16:32 2011
@@ -37,13 +37,17 @@ public class HadoopYarnProtoRPC extends
@Override
public Server getServer(Class protocol, Object instance,
InetSocketAddress addr, Configuration conf,
- SecretManager<? extends TokenIdentifier> secretManager) {
- LOG.info("Creating a HadoopYarnProtoRpc server for protocol " + protocol);
+ SecretManager<? extends TokenIdentifier> secretManager,
+ int numHandlers) {
+ LOG.info("Creating a HadoopYarnProtoRpc server for protocol " + protocol +
+ " with " + numHandlers + " handlers");
LOG.info("Configured SecurityInfo class name is "
+ conf.get(CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME));
final RPC.Server hadoopServer;
- hadoopServer = RpcFactoryProvider.getServerFactory(conf).getServer(protocol, instance, addr, conf, secretManager);
+ hadoopServer =
+ RpcFactoryProvider.getServerFactory(conf).getServer(protocol, instance,
+ addr, conf, secretManager, numHandlers);
Server server = new Server() {
@Override
@@ -70,4 +74,4 @@ public class HadoopYarnProtoRPC extends
}
-}
\ No newline at end of file
+}
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java Wed May 25 10:16:32 2011
@@ -61,15 +61,17 @@ public class HadoopYarnRPC extends YarnR
@Override
public Server getServer(Class protocol, Object instance,
InetSocketAddress addr, Configuration conf,
- SecretManager<? extends TokenIdentifier> secretManager) {
- LOG.info("Creating a HadoopYarnRpc server for protocol " + protocol);
+ SecretManager<? extends TokenIdentifier> secretManager,
+ int numHandlers) {
+ LOG.info("Creating a HadoopYarnRpc server for protocol " + protocol +
+ " with " + numHandlers + " handlers");
LOG.info("Configured SecurityInfo class name is "
+ conf.get(CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME));
RPC.setProtocolEngine(conf, protocol, AvroSpecificRpcEngine.class);
final RPC.Server hadoopServer;
try {
hadoopServer = RPC.getServer(protocol, instance, addr.getHostName(),
- addr.getPort(), 1, false, conf, secretManager);
+ addr.getPort(), numHandlers, false, conf, secretManager);
} catch (IOException e) {
throw new YarnException(e);
}
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java Wed May 25 10:16:32 2011
@@ -43,7 +43,8 @@ public abstract class YarnRPC {
public abstract Server getServer(Class protocol, Object instance,
InetSocketAddress addr, Configuration conf,
- SecretManager<? extends TokenIdentifier> secretManager);
+ SecretManager<? extends TokenIdentifier> secretManager,
+ int numHandlers);
public static YarnRPC create(Configuration conf) {
String clazzName = conf.get(RPC_CLASSNAME);
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java Wed May 25 10:16:32 2011
@@ -81,7 +81,7 @@ public class TestRPC {
String bindAddr = "localhost:0";
InetSocketAddress addr = NetUtils.createSocketAddr(bindAddr);
Server server = rpc.getServer(ContainerManager.class,
- new DummyContainerManager(), addr, conf, null);
+ new DummyContainerManager(), addr, conf, null, 1);
server.start();
ContainerManager proxy = (ContainerManager)
rpc.getProxy(ContainerManager.class,
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java Wed May 25 10:16:32 2011
@@ -38,7 +38,9 @@ public class TestRPCFactories {
AMRMProtocol instance = new AMRMProtocolTestImpl();
Server server = null;
try {
- server = RpcServerFactoryPBImpl.get().getServer(AMRMProtocol.class, instance, addr, conf, null);
+ server =
+ RpcServerFactoryPBImpl.get().getServer(
+ AMRMProtocol.class, instance, addr, conf, null, 1);
server.start();
} catch (YarnException e) {
e.printStackTrace();
@@ -58,7 +60,9 @@ public class TestRPCFactories {
AMRMProtocol instance = new AMRMProtocolTestImpl();
Server server = null;
try {
- server = RpcServerFactoryPBImpl.get().getServer(AMRMProtocol.class, instance, addr, conf, null);
+ server =
+ RpcServerFactoryPBImpl.get().getServer(
+ AMRMProtocol.class, instance, addr, conf, null, 1);
server.start();
System.err.println(server.getListenerAddress());
System.err.println(NetUtils.getConnectAddress(server));
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java Wed May 25 10:16:32 2011
@@ -37,7 +37,9 @@ public class TestRPCFactories {
ResourceTracker instance = new ResourceTrackerTestImpl();
Server server = null;
try {
- server = RpcServerFactoryPBImpl.get().getServer(ResourceTracker.class, instance, addr, conf, null);
+ server =
+ RpcServerFactoryPBImpl.get().getServer(
+ ResourceTracker.class, instance, addr, conf, null, 1);
server.start();
} catch (YarnException e) {
e.printStackTrace();
@@ -55,7 +57,9 @@ public class TestRPCFactories {
ResourceTracker instance = new ResourceTrackerTestImpl();
Server server = null;
try {
- server = RpcServerFactoryPBImpl.get().getServer(ResourceTracker.class, instance, addr, conf, null);
+ server =
+ RpcServerFactoryPBImpl.get().getServer(
+ ResourceTracker.class, instance, addr, conf, null, 1);
server.start();
System.err.println(server.getListenerAddress());
System.err.println(NetUtils.getConnectAddress(server));
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NMConfig.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NMConfig.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NMConfig.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NMConfig.java Wed May 25 10:16:32 2011
@@ -79,4 +79,14 @@ public class NMConfig {
"max.public.fetch.threads";
public static final int DEFAULT_MAX_PUBLIC_FETCH_THREADS = 4;
+
+ public static final String NM_LOCALIZATION_THREADS =
+ NM_PREFIX + "localiation.threads";
+
+ public static final int DEFAULT_NM_LOCALIZATION_THREADS = 5;
+
+ public static final String NM_CONTAINER_MGR_THREADS =
+ NM_PREFIX + "container.manager.threads";
+
+ public static final int DEFAULT_NM_CONTAINER_MGR_THREADS = 5;
}
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java Wed May 25 10:16:32 2011
@@ -66,6 +66,7 @@ import org.apache.hadoop.yarn.server.nod
import org.apache.hadoop.yarn.server.nodemanager.ContainerManagerEvent;
import org.apache.hadoop.yarn.server.nodemanager.Context;
import org.apache.hadoop.yarn.server.nodemanager.DeletionService;
+import org.apache.hadoop.yarn.server.nodemanager.NMConfig;
import org.apache.hadoop.yarn.server.nodemanager.NodeStatusUpdater;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.application.Application;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.application.ApplicationEvent;
@@ -207,7 +208,9 @@ public class ContainerManagerImpl extend
ContainerManagerSecurityInfo.class, SecurityInfo.class);
server =
rpc.getServer(ContainerManager.class, this, cmBindAddressStr, cmConf,
- this.containerTokenSecretManager);
+ this.containerTokenSecretManager,
+ cmConf.getInt(NMConfig.NM_CONTAINER_MGR_THREADS,
+ NMConfig.DEFAULT_NM_CONTAINER_MGR_THREADS));
LOG.info("ContainerManager started at " + cmBindAddressStr);
server.start();
super.start();
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java Wed May 25 10:16:32 2011
@@ -41,6 +41,7 @@ import org.apache.hadoop.security.token.
import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.hadoop.yarn.api.records.LocalResource;
import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
+
import static org.apache.hadoop.fs.CreateFlag.CREATE;
import static org.apache.hadoop.fs.CreateFlag.OVERWRITE;
import static org.apache.hadoop.yarn.server.nodemanager.NMConfig.DEFAULT_MAX_PUBLIC_FETCH_THREADS;
@@ -219,8 +220,12 @@ public class ResourceLocalizationService
LocalizerSecurityInfo.class, SecurityInfo.class);
secretManager = new LocalizerTokenSecretManager();
}
+
return rpc.getServer(LocalizationProtocol.class, this,
- localizationServerAddress, conf, secretManager);
+ localizationServerAddress, conf, secretManager,
+ conf.getInt(NMConfig.NM_LOCALIZATION_THREADS,
+ NMConfig.DEFAULT_NM_LOCALIZATION_THREADS));
+
}
@Override
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestRPCFactories.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestRPCFactories.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestRPCFactories.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestRPCFactories.java Wed May 25 10:16:32 2011
@@ -52,7 +52,9 @@ public class TestRPCFactories {
LocalizationProtocol instance = new LocalizationProtocolTestImpl();
Server server = null;
try {
- server = RpcServerFactoryPBImpl.get().getServer(LocalizationProtocol.class, instance, addr, conf, null);
+ server =
+ RpcServerFactoryPBImpl.get().getServer(
+ LocalizationProtocol.class, instance, addr, conf, null, 1);
server.start();
} catch (YarnException e) {
e.printStackTrace();
@@ -72,7 +74,9 @@ public class TestRPCFactories {
LocalizationProtocol instance = new LocalizationProtocolTestImpl();
Server server = null;
try {
- server = RpcServerFactoryPBImpl.get().getServer(LocalizationProtocol.class, instance, addr, conf, null);
+ server =
+ RpcServerFactoryPBImpl.get().getServer(
+ LocalizationProtocol.class, instance, addr, conf, null, 1);
server.start();
System.err.println(server.getListenerAddress());
System.err.println(NetUtils.getConnectAddress(server));
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/api/protocolrecords/impl/pb/TestPBLocalizerRPC.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/api/protocolrecords/impl/pb/TestPBLocalizerRPC.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/api/protocolrecords/impl/pb/TestPBLocalizerRPC.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/api/protocolrecords/impl/pb/TestPBLocalizerRPC.java Wed May 25 10:16:32 2011
@@ -36,7 +36,7 @@ public class TestPBLocalizerRPC {
Configuration conf = new Configuration();
YarnRPC rpc = YarnRPC.create(conf);
server = rpc.getServer(
- LocalizationProtocol.class, this, locAddr, conf, null);
+ LocalizationProtocol.class, this, locAddr, conf, null, 1);
server.start();
}
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java Wed May 25 10:16:32 2011
@@ -58,7 +58,9 @@ public class AdminService extends Abstra
SchedulerSecurityInfo.class, SecurityInfo.class);
this.server =
rpc.getServer(RMAdminProtocol.class, this, masterServiceAddress,
- serverConf, null);
+ serverConf, null,
+ serverConf.getInt(RMConfig.RM_ADMIN_THREADS,
+ RMConfig.DEFAULT_RM_ADMIN_THREADS));
this.server.start();
super.start();
}
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java Wed May 25 10:16:32 2011
@@ -107,7 +107,9 @@ AMRMProtocol, EventHandler<ASMEvent<Appl
SchedulerSecurityInfo.class, SecurityInfo.class);
this.server =
rpc.getServer(AMRMProtocol.class, this, masterServiceAddress,
- serverConf, this.appTokenManager);
+ serverConf, this.appTokenManager,
+ serverConf.getInt(RMConfig.RM_AM_THREADS,
+ RMConfig.DEFAULT_RM_AM_THREADS));
this.server.start();
super.start();
}
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java Wed May 25 10:16:32 2011
@@ -113,7 +113,9 @@ public class ClientRMService extends Abs
this.server =
rpc.getServer(ClientRMProtocol.class, this,
clientBindAddress,
- clientServerConf, null);
+ clientServerConf, null,
+ clientServerConf.getInt(RMConfig.RM_CLIENT_THREADS,
+ RMConfig.DEFAULT_RM_CLIENT_THREADS));
this.server.start();
super.start();
}
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMConfig.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMConfig.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMConfig.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMConfig.java Wed May 25 10:16:32 2011
@@ -49,4 +49,20 @@ public class RMConfig {
YarnConfiguration.RM_PREFIX
+ "nmliveliness-monitor.monitoring-interval";
public static final long DEFAULT_NMLIVELINESS_MONITORING_INTERVAL = 1000;
+
+ public static final String RM_RESOURCE_TRACKER_THREADS =
+ YarnConfiguration.RM_PREFIX + "resource.tracker.threads";
+ public static final int DEFAULT_RM_RESOURCE_TRACKER_THREADS = 10;
+
+ public static final String RM_CLIENT_THREADS =
+ YarnConfiguration.RM_PREFIX + "client.threads";
+ public static final int DEFAULT_RM_CLIENT_THREADS = 10;
+
+ public static final String RM_AM_THREADS =
+ YarnConfiguration.RM_PREFIX + "am.threads";
+ public static final int DEFAULT_RM_AM_THREADS = 10;
+
+ public static final String RM_ADMIN_THREADS =
+ YarnConfiguration.RM_PREFIX + "admin.threads";
+ public static final int DEFAULT_RM_ADMIN_THREADS = 1;
}
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/RMResourceTrackerImpl.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/RMResourceTrackerImpl.java?rev=1127461&r1=1127460&r2=1127461&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/RMResourceTrackerImpl.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/RMResourceTrackerImpl.java Wed May 25 10:16:32 2011
@@ -161,7 +161,9 @@ ResourceTracker, ClusterTracker {
RMNMSecurityInfoClass.class, SecurityInfo.class);
this.server =
rpc.getServer(ResourceTracker.class, this, resourceTrackerAddress,
- rtServerConf, null);
+ rtServerConf, null,
+ rtServerConf.getInt(RMConfig.RM_RESOURCE_TRACKER_THREADS,
+ RMConfig.DEFAULT_RM_RESOURCE_TRACKER_THREADS));
this.server.start();
this.nmLivelinessMonitor.start();
LOG.info("Expiry interval of NodeManagers set to " + nmExpiryInterval);