Author: mahadev Date: Sun Jul 24 08:11:42 2011 New Revision: 1150294 URL: http://svn.apache.org/viewvc?rev=1150294&view=rev Log: HADOOP-6929. Backport changes to MR-279 (mahadev and owen)
Added: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/TunnelProtocolSecurityInfo.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/resources/META-INF/ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/resources/META-INF/services/ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/launcher/ContainerLauncherImpl.java hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSSecurityInfo.java hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RpcFactoryProvider.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/ProtoOverHadoopRpcEngine.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerManagerSecurityInfo.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/SchedulerSecurityInfo.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/admin/AdminSecurityInfo.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/RMNMSecurityInfoClass.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerSecurityInfo.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/AMLauncher.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/tools/RMAdmin.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerTokenSecretManager.java Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original) +++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Sun Jul 24 08:11:42 2011 @@ -4,6 +4,8 @@ Trunk (unreleased changes) MAPREDUCE-279 + + HADOOP-6929. Backport changes to MR-279 (mahadev and owen) MAPREDUCE-2661. Fix TaskImpl to not access MapTaskImpl. (Ahmed Radwan via sharad) Modified: hadoop/common/branches/MR-279/mapreduce/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/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java (original) +++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/client/MRClientService.java Sun Jul 24 08:11:42 2011 @@ -136,7 +136,7 @@ public class MRClientService extends Abs new ApplicationTokenIdentifier(this.appContext.getApplicationID()); secretManager.setMasterKey(identifier, bytes); conf.setClass( - CommonConfigurationKeysPublic.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, SchedulerSecurityInfo.class, SecurityInfo.class); // Same for now. } server = Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/launcher/ContainerLauncherImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/launcher/ContainerLauncherImpl.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/launcher/ContainerLauncherImpl.java (original) +++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/launcher/ContainerLauncherImpl.java Sun Jul 24 08:11:42 2011 @@ -52,6 +52,7 @@ import org.apache.hadoop.yarn.api.protoc import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerToken; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.ipc.YarnRPC; @@ -89,7 +90,7 @@ public class ContainerLauncherImpl exten // doesn't affect the original configuration Configuration myLocalConfig = new Configuration(conf); myLocalConfig.setClass( - CommonConfigurationKeysPublic.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, ContainerManagerSecurityInfo.class, SecurityInfo.class); this.recordFactory = RecordFactoryProvider.getRecordFactory(conf); super.init(myLocalConfig); Modified: hadoop/common/branches/MR-279/mapreduce/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/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java (original) +++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java Sun Jul 24 08:11:42 2011 @@ -246,7 +246,7 @@ public class RMCommunicator extends Abst } if (UserGroupInformation.isSecurityEnabled()) { - conf.setClass(CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + conf.setClass(YarnConfiguration.YARN_SECURITY_INFO, SchedulerSecurityInfo.class, SecurityInfo.class); String tokenURLEncodedStr = System.getenv().get( Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSSecurityInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSSecurityInfo.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSSecurityInfo.java (original) +++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSSecurityInfo.java Sun Jul 24 08:11:42 2011 @@ -20,6 +20,7 @@ package org.apache.hadoop.mapreduce.v2.s import java.lang.annotation.Annotation; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.v2.jobhistory.JHConfig; import org.apache.hadoop.security.KerberosInfo; import org.apache.hadoop.security.SecurityInfo; @@ -28,7 +29,7 @@ import org.apache.hadoop.security.token. public class ClientHSSecurityInfo implements SecurityInfo { @Override - public KerberosInfo getKerborosInfo(Class<?> protocol) { + public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) { return new KerberosInfo() { @Override @@ -49,7 +50,7 @@ public class ClientHSSecurityInfo implem } @Override - public TokenInfo getTokenInfo(Class<?> protocol) { + public TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) { return null; } Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java (original) +++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java Sun Jul 24 08:11:42 2011 @@ -69,6 +69,7 @@ import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.security.SecurityInfo; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; @@ -103,7 +104,7 @@ public class HistoryClientService extend YarnRPC rpc = YarnRPC.create(getConfig()); Configuration conf = new Configuration(getConfig()); conf.setClass( - CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, ClientHSSecurityInfo.class, SecurityInfo.class); initializeWebApp(getConfig()); String serviceAddr = conf.get(JHConfig.HS_BIND_ADDRESS, Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java (original) +++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java Sun Jul 24 08:11:42 2011 @@ -55,6 +55,7 @@ import org.apache.hadoop.yarn.YarnExcept import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ApplicationReport; import org.apache.hadoop.yarn.api.records.ApplicationState; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; @@ -191,7 +192,7 @@ public class ClientServiceDelegate { public MRClientProtocol run() { Configuration myConf = new Configuration(conf); myConf.setClass( - CommonConfigurationKeysPublic.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, SchedulerSecurityInfo.class, SecurityInfo.class); YarnRPC rpc = YarnRPC.create(myConf); return (MRClientProtocol) rpc.getProxy(MRClientProtocol.class, @@ -206,7 +207,7 @@ public class ClientServiceDelegate { LOG.trace("Connecting to HistoryServer at: " + serviceAddr); Configuration myConf = new Configuration(conf); //TODO This should ideally be using it's own class (instead of ClientRMSecurityInfo) - myConf.setClass(CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + myConf.setClass(YarnConfiguration.YARN_SECURITY_INFO, ClientRMSecurityInfo.class, SecurityInfo.class); YarnRPC rpc = YarnRPC.create(myConf); realProxy = (MRClientProtocol) rpc.getProxy(MRClientProtocol.class, Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java (original) +++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java Sun Jul 24 08:11:42 2011 @@ -91,7 +91,7 @@ public class ResourceMgrDelegate { LOG.info("Connecting to ResourceManager at " + rmAddress); Configuration appsManagerServerConf = new Configuration(this.conf); appsManagerServerConf.setClass( - CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, ClientRMSecurityInfo.class, SecurityInfo.class); applicationsManager = (ClientRMProtocol) rpc.getProxy(ClientRMProtocol.class, Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java Sun Jul 24 08:11:42 2011 @@ -39,6 +39,9 @@ public class YarnConfiguration extends C public static final String APPSMANAGER_ADDRESS = RM_PREFIX + "appsManager.address"; + + public static final String YARN_SECURITY_INFO = + "yarn.security.info.class.name"; public static final String DEFAULT_APPSMANAGER_BIND_ADDRESS = "0.0.0.0:8040"; Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RpcFactoryProvider.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RpcFactoryProvider.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RpcFactoryProvider.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/factory/providers/RpcFactoryProvider.java Sun Jul 24 08:11:42 2011 @@ -2,7 +2,6 @@ package org.apache.hadoop.yarn.factory.p import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.security.InvalidParameterException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.YarnException; Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java Sun Jul 24 08:11:42 2011 @@ -10,6 +10,7 @@ import org.apache.hadoop.fs.CommonConfig import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.security.token.SecretManager; import org.apache.hadoop.security.token.TokenIdentifier; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.factory.providers.RpcFactoryProvider; /** @@ -29,7 +30,7 @@ public class HadoopYarnProtoRPC extends Configuration myConf = new Configuration(conf); LOG.info("Creating a HadoopYarnProtoRpc proxy for protocol " + protocol); LOG.debug("Configured SecurityInfo class name is " - + myConf.get(CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME)); + + myConf.get(YarnConfiguration.YARN_SECURITY_INFO)); return RpcFactoryProvider.getClientFactory(myConf).getClient(protocol, 1, addr, myConf); } @@ -42,7 +43,7 @@ public class HadoopYarnProtoRPC extends 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)); + + conf.get(YarnConfiguration.YARN_SECURITY_INFO)); final RPC.Server hadoopServer; hadoopServer = Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java Sun Jul 24 08:11:42 2011 @@ -25,12 +25,12 @@ import org.apache.avro.ipc.Server; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.ipc.AvroSpecificRpcEngine; import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.security.token.SecretManager; import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.conf.YarnConfiguration; /** * This uses Hadoop RPC. Uses a tunnel AvroSpecificRpcEngine over @@ -49,7 +49,7 @@ public class HadoopYarnRPC extends YarnR Configuration myConf = new Configuration(conf); LOG.info("Creating a HadoopYarnRpc proxy for protocol " + protocol); LOG.debug("Configured SecurityInfo class name is " - + myConf.get(CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME)); + + myConf.get(YarnConfiguration.YARN_SECURITY_INFO)); RPC.setProtocolEngine(myConf, protocol, AvroSpecificRpcEngine.class); try { return RPC.getProxy(protocol, 1, addr, myConf); @@ -66,7 +66,7 @@ public class HadoopYarnRPC extends YarnR 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)); + + conf.get(YarnConfiguration.YARN_SECURITY_INFO)); RPC.setProtocolEngine(conf, protocol, AvroSpecificRpcEngine.class); final RPC.Server hadoopServer; try { Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/ProtoOverHadoopRpcEngine.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/ProtoOverHadoopRpcEngine.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/ProtoOverHadoopRpcEngine.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/ProtoOverHadoopRpcEngine.java Sun Jul 24 08:11:42 2011 @@ -44,7 +44,7 @@ public class ProtoOverHadoopRpcEngine im private static final RpcEngine ENGINE = new WritableRpcEngine(); /** Tunnel a Proto RPC request and response through Hadoop's RPC. */ - private static interface TunnelProtocol extends VersionedProtocol { + public static interface TunnelProtocol extends VersionedProtocol { /** WritableRpcEngine requires a versionID */ public static final long versionID = 1L; @@ -249,13 +249,13 @@ public class ProtoOverHadoopRpcEngine im /** * Writable Wrapper for Protocol Buffer Responses */ - private static class ProtoSpecificResponseWritable implements Writable { + public static class ProtoSpecificResponseWritable implements Writable { ProtoSpecificRpcResponse message; public ProtoSpecificResponseWritable() { } - ProtoSpecificResponseWritable(ProtoSpecificRpcResponse message) { + public ProtoSpecificResponseWritable(ProtoSpecificRpcResponse message) { this.message = message; } @@ -279,13 +279,13 @@ public class ProtoOverHadoopRpcEngine im /** * Writable Wrapper for Protocol Buffer Requests */ - private static class ProtoSpecificRequestWritable implements Writable { + public static class ProtoSpecificRequestWritable implements Writable { ProtoSpecificRpcRequest message; public ProtoSpecificRequestWritable() { } - ProtoSpecificRequestWritable(ProtoSpecificRpcRequest message) { + public ProtoSpecificRequestWritable(ProtoSpecificRpcRequest message) { this.message = message; } Added: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/TunnelProtocolSecurityInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/TunnelProtocolSecurityInfo.java?rev=1150294&view=auto ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/TunnelProtocolSecurityInfo.java (added) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/TunnelProtocolSecurityInfo.java Sun Jul 24 08:11:42 2011 @@ -0,0 +1,47 @@ +package org.apache.hadoop.yarn.ipc; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.security.AnnotatedSecurityInfo; +import org.apache.hadoop.security.KerberosInfo; +import org.apache.hadoop.security.SecurityInfo; +import org.apache.hadoop.security.token.TokenInfo; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.ipc.ProtoOverHadoopRpcEngine.TunnelProtocol; + +public class TunnelProtocolSecurityInfo implements SecurityInfo { + public static final Log LOG = LogFactory.getLog(TunnelProtocolSecurityInfo.class); + + @Override + public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) { + LOG.info("Get kerberos info being called, Tunnelprotocolinfo " + protocol); + if (TunnelProtocol.class.equals(protocol)) { + try { + LOG.info("The Tunnel Security info class " + conf.get(YarnConfiguration.YARN_SECURITY_INFO)); + Class<SecurityInfo> secInfoClass = (Class<SecurityInfo>) conf.getClass( + YarnConfiguration.YARN_SECURITY_INFO, SecurityInfo.class); + SecurityInfo secInfo = secInfoClass.newInstance(); + return secInfo.getKerberosInfo(protocol, conf); + } catch (Exception e) { + throw new RuntimeException("Unable to load class", e); + } + } + return null; + } + + @Override + public TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) { + if (TunnelProtocol.class.equals(protocol)) { + try { + Class<SecurityInfo> secInfoClass = (Class<SecurityInfo>) conf.getClass( + YarnConfiguration.YARN_SECURITY_INFO, AnnotatedSecurityInfo.class); + SecurityInfo secInfo = secInfoClass.newInstance(); + return secInfo.getTokenInfo(protocol, conf); + } catch (Exception e) { + throw new RuntimeException("Unable to load Yarn Security Info class", e); + } + } + return null; + } +} \ No newline at end of file Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerManagerSecurityInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerManagerSecurityInfo.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerManagerSecurityInfo.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerManagerSecurityInfo.java Sun Jul 24 08:11:42 2011 @@ -20,6 +20,7 @@ package org.apache.hadoop.yarn.security; import java.lang.annotation.Annotation; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.KerberosInfo; import org.apache.hadoop.security.SecurityInfo; import org.apache.hadoop.security.token.TokenIdentifier; @@ -29,12 +30,12 @@ import org.apache.hadoop.security.token. public class ContainerManagerSecurityInfo implements SecurityInfo { @Override - public KerberosInfo getKerborosInfo(Class<?> protocol) { + public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) { return null; } @Override - public TokenInfo getTokenInfo(Class<?> protocol) { + public TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) { return new TokenInfo() { @Override Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/SchedulerSecurityInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/SchedulerSecurityInfo.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/SchedulerSecurityInfo.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/SchedulerSecurityInfo.java Sun Jul 24 08:11:42 2011 @@ -20,6 +20,7 @@ package org.apache.hadoop.yarn.security; import java.lang.annotation.Annotation; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.KerberosInfo; import org.apache.hadoop.security.SecurityInfo; import org.apache.hadoop.security.token.TokenIdentifier; @@ -29,12 +30,12 @@ import org.apache.hadoop.security.token. public class SchedulerSecurityInfo implements SecurityInfo { @Override - public KerberosInfo getKerborosInfo(Class<?> protocol) { + public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) { return null; } @Override - public TokenInfo getTokenInfo(Class<?> protocol) { + public TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) { return new TokenInfo() { @Override Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/admin/AdminSecurityInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/admin/AdminSecurityInfo.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/admin/AdminSecurityInfo.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/admin/AdminSecurityInfo.java Sun Jul 24 08:11:42 2011 @@ -2,6 +2,7 @@ package org.apache.hadoop.yarn.security. import java.lang.annotation.Annotation; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.KerberosInfo; import org.apache.hadoop.security.SecurityInfo; import org.apache.hadoop.security.token.TokenInfo; @@ -10,7 +11,7 @@ import org.apache.hadoop.yarn.conf.YarnC public class AdminSecurityInfo implements SecurityInfo { @Override - public KerberosInfo getKerborosInfo(Class<?> protocol) { + public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) { return new KerberosInfo() { @Override @@ -31,7 +32,7 @@ public class AdminSecurityInfo implement } @Override - public TokenInfo getTokenInfo(Class<?> protocol) { + public TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) { return null; } Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java Sun Jul 24 08:11:42 2011 @@ -20,6 +20,7 @@ package org.apache.hadoop.yarn.security. import java.lang.annotation.Annotation; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.KerberosInfo; import org.apache.hadoop.security.SecurityInfo; import org.apache.hadoop.security.token.TokenInfo; @@ -28,7 +29,7 @@ import org.apache.hadoop.yarn.conf.YarnC public class ClientRMSecurityInfo implements SecurityInfo { @Override - public KerberosInfo getKerborosInfo(Class<?> protocol) { + public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) { return new KerberosInfo() { @Override @@ -49,7 +50,7 @@ public class ClientRMSecurityInfo implem } @Override - public TokenInfo getTokenInfo(Class<?> protocol) { + public TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) { return null; } Added: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo?rev=1150294&view=auto ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo (added) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo Sun Jul 24 08:11:42 2011 @@ -0,0 +1 @@ +org.apache.hadoop.yarn.ipc.TunnelProtocolSecurityInfo Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/RMNMSecurityInfoClass.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/RMNMSecurityInfoClass.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/RMNMSecurityInfoClass.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/RMNMSecurityInfoClass.java Sun Jul 24 08:11:42 2011 @@ -20,6 +20,7 @@ package org.apache.hadoop.yarn.server; import java.lang.annotation.Annotation; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.KerberosInfo; import org.apache.hadoop.security.SecurityInfo; import org.apache.hadoop.security.token.TokenInfo; @@ -28,7 +29,7 @@ import org.apache.hadoop.yarn.conf.YarnC public class RMNMSecurityInfoClass implements SecurityInfo { @Override - public KerberosInfo getKerborosInfo(Class<?> protocol) { + public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) { return new KerberosInfo() { @Override @@ -49,7 +50,7 @@ public class RMNMSecurityInfoClass imple } @Override - public TokenInfo getTokenInfo(Class<?> protocol) { + public TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) { return null; } Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java Sun Jul 24 08:11:42 2011 @@ -40,6 +40,7 @@ import org.apache.hadoop.yarn.api.record import org.apache.hadoop.yarn.api.records.ContainerState; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.event.Dispatcher; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; import org.apache.hadoop.yarn.factories.RecordFactory; @@ -152,7 +153,7 @@ public class NodeStatusUpdaterImpl exten InetSocketAddress rmAddress = NetUtils.createSocketAddr(this.rmAddress); Configuration rmClientConf = new Configuration(getConfig()); rmClientConf.setClass( - CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, RMNMSecurityInfoClass.class, SecurityInfo.class); return (ResourceTracker) rpc.getProxy(ResourceTracker.class, rmAddress, rmClientConf); Modified: hadoop/common/branches/MR-279/mapreduce/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/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java Sun Jul 24 08:11:42 2011 @@ -50,6 +50,7 @@ import org.apache.hadoop.yarn.api.record import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerStatus; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.event.AsyncDispatcher; import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; @@ -206,7 +207,7 @@ public class ContainerManagerImpl extend this.nodeStatusUpdater.getRMNMSharedSecret()); } Configuration cmConf = new Configuration(getConfig()); - cmConf.setClass(CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + cmConf.setClass(YarnConfiguration.YARN_SECURITY_INFO, ContainerManagerSecurityInfo.class, SecurityInfo.class); server = rpc.getServer(ContainerManager.class, this, cmBindAddressStr, cmConf, Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java Sun Jul 24 08:11:42 2011 @@ -51,6 +51,7 @@ import org.apache.hadoop.security.UserGr import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.yarn.api.records.LocalResource; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; @@ -118,7 +119,7 @@ public class ContainerLocalizer { YarnRPC rpc = YarnRPC.create(localizerConf); if (UserGroupInformation.isSecurityEnabled()) { localizerConf.setClass( - CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, LocalizerSecurityInfo.class, SecurityInfo.class); } return (LocalizationProtocol) Modified: hadoop/common/branches/MR-279/mapreduce/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/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java Sun Jul 24 08:11:42 2011 @@ -46,6 +46,7 @@ import org.apache.hadoop.security.token. import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.LocalResource; import org.apache.hadoop.yarn.api.records.LocalResourceVisibility; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import static org.apache.hadoop.fs.CreateFlag.CREATE; import static org.apache.hadoop.fs.CreateFlag.OVERWRITE; @@ -236,7 +237,7 @@ public class ResourceLocalizationService // sec-info classes LocalizerTokenSecretManager secretManager = null; if (UserGroupInformation.isSecurityEnabled()) { - conf.setClass(CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + conf.setClass(YarnConfiguration.YARN_SECURITY_INFO, LocalizerSecurityInfo.class, SecurityInfo.class); secretManager = new LocalizerTokenSecretManager(); } Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerSecurityInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerSecurityInfo.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerSecurityInfo.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerSecurityInfo.java Sun Jul 24 08:11:42 2011 @@ -20,6 +20,7 @@ package org.apache.hadoop.yarn.server.no import java.lang.annotation.Annotation; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.KerberosInfo; import org.apache.hadoop.security.SecurityInfo; import org.apache.hadoop.security.token.TokenIdentifier; @@ -29,12 +30,12 @@ import org.apache.hadoop.security.token. public class LocalizerSecurityInfo implements SecurityInfo { @Override - public KerberosInfo getKerborosInfo(Class<?> protocol) { + public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) { return null; } @Override - public TokenInfo getTokenInfo(Class<?> protocol) { + public TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) { return new TokenInfo() { @Override Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java Sun Jul 24 08:11:42 2011 @@ -44,6 +44,7 @@ import org.apache.hadoop.yarn.server.res import org.apache.hadoop.yarn.server.resourcemanager.api.protocolrecords.RefreshSuperUserGroupsConfigurationResponse; import org.apache.hadoop.yarn.server.resourcemanager.api.protocolrecords.RefreshUserToGroupsMappingsRequest; import org.apache.hadoop.yarn.server.resourcemanager.api.protocolrecords.RefreshUserToGroupsMappingsResponse; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; @@ -93,7 +94,7 @@ public class AdminService extends Abstra YarnRPC rpc = YarnRPC.create(getConfig()); Configuration serverConf = new Configuration(getConfig()); serverConf.setClass( - CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, SchedulerSecurityInfo.class, SecurityInfo.class); this.server = rpc.getServer(RMAdminProtocol.class, this, masterServiceAddress, Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java Sun Jul 24 08:11:42 2011 @@ -105,7 +105,7 @@ AMRMProtocol, EventHandler<ASMEvent<Appl YarnRPC rpc = YarnRPC.create(getConfig()); Configuration serverConf = new Configuration(getConfig()); serverConf.setClass( - CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, SchedulerSecurityInfo.class, SecurityInfo.class); this.server = rpc.getServer(AMRMProtocol.class, this, masterServiceAddress, Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java Sun Jul 24 08:11:42 2011 @@ -144,7 +144,7 @@ public class ClientRMService extends Abs YarnRPC rpc = YarnRPC.create(getConfig()); Configuration clientServerConf = new Configuration(getConfig()); clientServerConf.setClass( - CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, ClientRMSecurityInfo.class, SecurityInfo.class); this.server = rpc.getServer(ClientRMProtocol.class, this, Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java Sun Jul 24 08:11:42 2011 @@ -27,6 +27,7 @@ import org.apache.hadoop.conf.Configurat import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.security.SecurityInfo; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; @@ -83,7 +84,7 @@ implements ResourceTracker{ YarnRPC rpc = YarnRPC.create(getConfig()); Configuration rtServerConf = new Configuration(getConfig()); rtServerConf.setClass( - CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, RMNMSecurityInfoClass.class, SecurityInfo.class); this.server = rpc.getServer(ResourceTracker.class, this, resourceTrackerAddress, Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/AMLauncher.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/AMLauncher.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/AMLauncher.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/AMLauncher.java Sun Jul 24 08:11:42 2011 @@ -97,7 +97,7 @@ public class AMLauncher implements Runna this.applicationTokenSecretManager = applicationTokenSecretManager; this.clientToAMSecretManager = clientToAMSecretManager; this.conf.setClass( - CommonConfigurationKeysPublic.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, ContainerManagerSecurityInfo.class, SecurityInfo.class); this.eventType = eventType; this.handler = asmContext.getDispatcher().getEventHandler(); Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/tools/RMAdmin.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/tools/RMAdmin.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/tools/RMAdmin.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/tools/RMAdmin.java Sun Jul 24 08:11:42 2011 @@ -133,7 +133,7 @@ public class RMAdmin extends Configured final YarnRPC rpc = YarnRPC.create(conf); if (UserGroupInformation.isSecurityEnabled()) { - conf.setClass(CommonConfigurationKeys.HADOOP_SECURITY_INFO_CLASS_NAME, + conf.setClass(YarnConfiguration.YARN_SECURITY_INFO, AdminSecurityInfo.class, SecurityInfo.class); } Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerTokenSecretManager.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerTokenSecretManager.java?rev=1150294&r1=1150293&r2=1150294&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerTokenSecretManager.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerTokenSecretManager.java Sun Jul 24 08:11:42 2011 @@ -196,7 +196,7 @@ public class TestContainerTokenSecretMan currentUser.addToken(appToken); conf.setClass( - CommonConfigurationKeysPublic.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, SchedulerSecurityInfo.class, SecurityInfo.class); AMRMProtocol scheduler = currentUser.doAs(new PrivilegedAction<AMRMProtocol>() { @@ -269,7 +269,7 @@ public class TestContainerTokenSecretMan containerToken.getService())); currentUser.addToken(token); conf.setClass( - CommonConfigurationKeysPublic.HADOOP_SECURITY_INFO_CLASS_NAME, + YarnConfiguration.YARN_SECURITY_INFO, ContainerManagerSecurityInfo.class, SecurityInfo.class); currentUser.doAs(new PrivilegedAction<Void>() { @Override