diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java index 37474b8..f6feb36 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java @@ -34,7 +34,7 @@ import org.apache.hadoop.yarn.security.AMRMTokenIdentifier; import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol; -public class ClientRMProxy extends RMProxy { +public class ClientRMProxy extends RMProxy { private static final Log LOG = LogFactory.getLog(ClientRMProxy.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java index 4ca44e1..09cbdaf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java @@ -56,7 +56,7 @@ private final LinkedHashMap cmProxy; private final Configuration conf; private final YarnRPC rpc; - + public ContainerManagementProtocolProxy(Configuration conf) { this.conf = conf; @@ -75,11 +75,11 @@ public ContainerManagementProtocolProxy(Configuration conf) { new LinkedHashMap(); rpc = YarnRPC.create(conf); } - + public synchronized ContainerManagementProtocolProxyData getProxy( String containerManagerBindAddr, ContainerId containerId) throws InvalidToken { - + // This get call will update the map which is working as LRU cache. ContainerManagementProtocolProxyData proxy = cmProxy.get(containerManagerBindAddr); @@ -105,7 +105,7 @@ public synchronized ContainerManagementProtocolProxyData getProxy( proxy = cmProxy.get(containerManagerBindAddr); } } - + if (proxy == null) { proxy = new ContainerManagementProtocolProxyData(rpc, containerManagerBindAddr, @@ -115,16 +115,16 @@ public synchronized ContainerManagementProtocolProxyData getProxy( String cmAddr = cmProxy.keySet().iterator().next(); removeProxy(cmProxy.get(cmAddr)); } - + cmProxy.put(containerManagerBindAddr, proxy); } // This is to track active users of this proxy. proxy.activeCallers++; updateLRUCache(containerManagerBindAddr); - + return proxy; } - + private void updateLRUCache(String containerManagerBindAddr) { ContainerManagementProtocolProxyData proxy = cmProxy.remove(containerManagerBindAddr); @@ -152,7 +152,7 @@ private synchronized void removeProxy( mayBeCloseProxy(proxy); } } - + public synchronized void stopAllProxies() { List nodeIds = new ArrayList(); nodeIds.addAll(this.cmProxy.keySet()); @@ -168,14 +168,14 @@ public synchronized void stopAllProxies() { } cmProxy.clear(); } - + public class ContainerManagementProtocolProxyData { private final String containerManagerBindAddr; private final ContainerManagementProtocol proxy; private int activeCallers; private boolean scheduledForClose; private final Token token; - + @Private @VisibleForTesting public ContainerManagementProtocolProxyData(YarnRPC rpc, @@ -199,7 +199,7 @@ protected ContainerManagementProtocol newProxy(final YarnRPC rpc, throw new InvalidToken("No NMToken sent for " + containerManagerBindAddr); } - + final InetSocketAddress cmAddr = NetUtils.createSocketAddr(containerManagerBindAddr); LOG.info("Opening proxy : " + containerManagerBindAddr); @@ -217,8 +217,7 @@ protected ContainerManagementProtocol newProxy(final YarnRPC rpc, @Override public ContainerManagementProtocol run() { - return (ContainerManagementProtocol) rpc.getProxy( - ContainerManagementProtocol.class, cmAddr, conf); + return rpc.getProxy(ContainerManagementProtocol.class, cmAddr, conf); } }); return proxy; @@ -228,5 +227,5 @@ public ContainerManagementProtocol getContainerManagementProtocol() { return proxy; } } - + } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/GetGroupsForTesting.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/GetGroupsForTesting.java index 8c716fc..3571b23 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/GetGroupsForTesting.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/GetGroupsForTesting.java @@ -63,7 +63,7 @@ protected GetUserMappingsProtocol getUgmProtocol() throws IOException { YarnConfiguration.DEFAULT_RM_ADMIN_PORT); final YarnRPC rpc = YarnRPC.create(conf); - ResourceManagerAdministrationProtocol adminProtocol = (ResourceManagerAdministrationProtocol) rpc.getProxy( + ResourceManagerAdministrationProtocol adminProtocol = rpc.getProxy( ResourceManagerAdministrationProtocol.class, addr, getConf()); return adminProtocol; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java index 5fff760..67f0111 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java @@ -44,17 +44,16 @@ @InterfaceAudience.Public @InterfaceStability.Evolving -@SuppressWarnings("unchecked") -public class RMProxy { +public class RMProxy { private static final Log LOG = LogFactory.getLog(RMProxy.class); public static T createRMProxy(final Configuration conf, final Class protocol, InetSocketAddress rmAddress) throws IOException { RetryPolicy retryPolicy = createRetryPolicy(conf); - T proxy = RMProxy.getProxy(conf, protocol, rmAddress); + T proxy = RMProxy.getProxy(conf, protocol, rmAddress); LOG.info("Connecting to ResourceManager at " + rmAddress); - return (T) RetryProxy.create(protocol, proxy, retryPolicy); + return protocol.cast(RetryProxy.create(protocol, proxy, retryPolicy)); } private static T getProxy(final Configuration conf, @@ -65,7 +64,7 @@ @Override public T run() { - return (T) YarnRPC.create(conf).getProxy(protocol, rmAddress, conf); + return YarnRPC.create(conf).getProxy(protocol, rmAddress, conf); } }); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcClientFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcClientFactory.java index dcca8b0..cb1ce1d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcClientFactory.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcClientFactory.java @@ -25,8 +25,8 @@ @InterfaceAudience.LimitedPrivate({ "MapReduce", "YARN" }) public interface RpcClientFactory { - - public Object getClient(Class protocol, long clientVersion, + + public T getClient(Class protocol, long clientVersion, InetSocketAddress addr, Configuration conf); public void stopClient(Object proxy); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcServerFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcServerFactory.java index 3940557..0aaf462 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcServerFactory.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/RpcServerFactory.java @@ -28,8 +28,8 @@ @InterfaceAudience.LimitedPrivate({ "MapReduce", "YARN" }) public interface RpcServerFactory { - - public Server getServer(Class protocol, Object instance, + + public Server getServer(Class protocol, T instance, InetSocketAddress addr, Configuration conf, SecretManager secretManager, int numHandlers, String portRangeConfig); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java index e7c737c..62d638b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java @@ -40,29 +40,34 @@ private static final String PB_IMPL_PACKAGE_SUFFIX = "impl.pb.client"; private static final String PB_IMPL_CLASS_SUFFIX = "PBClientImpl"; - + private static final RpcClientFactoryPBImpl self = new RpcClientFactoryPBImpl(); private Configuration localConf = new Configuration(); private ConcurrentMap, Constructor> cache = new ConcurrentHashMap, Constructor>(); - + public static RpcClientFactoryPBImpl get() { return RpcClientFactoryPBImpl.self; } - + private RpcClientFactoryPBImpl() { } - - public Object getClient(Class protocol, long clientVersion, + + @Override + public T getClient(Class protocol, long clientVersion, InetSocketAddress addr, Configuration conf) { - - Constructor constructor = cache.get(protocol); + + @SuppressWarnings("unchecked") + Constructor constructor = (Constructor) cache.get(protocol); if (constructor == null) { - Class pbClazz = null; + Class pbClazz; try { - pbClazz = localConf.getClassByName(getPBImplClassName(protocol)); + pbClazz = localConf.getClassByName(getPBImplClassName(protocol)).asSubclass(protocol); } catch (ClassNotFoundException e) { throw new YarnRuntimeException("Failed to load class: [" + getPBImplClassName(protocol) + "]", e); + } catch (ClassCastException e) { + throw new YarnRuntimeException("Failed to load class: [" + + getPBImplClassName(protocol) + "]", e); } try { constructor = pbClazz.getConstructor(Long.TYPE, InetSocketAddress.class, Configuration.class); @@ -73,7 +78,7 @@ public Object getClient(Class protocol, long clientVersion, } } try { - Object retObject = constructor.newInstance(clientVersion, addr, conf); + T retObject = constructor.newInstance(clientVersion, addr, conf); return retObject; } catch (InvocationTargetException e) { throw new YarnRuntimeException(e); @@ -98,20 +103,20 @@ public void stopClient(Object proxy) { } } - private String getPBImplClassName(Class clazz) { + private static String getPBImplClassName(Class clazz) { String srcPackagePart = getPackageName(clazz); String srcClassName = getClassName(clazz); String destPackagePart = srcPackagePart + "." + PB_IMPL_PACKAGE_SUFFIX; String destClassPart = srcClassName + PB_IMPL_CLASS_SUFFIX; return destPackagePart + "." + destClassPart; } - - private String getClassName(Class clazz) { + + private static String getClassName(Class clazz) { String fqName = clazz.getName(); return (fqName.substring(fqName.lastIndexOf(".") + 1, fqName.length())); } - - private String getPackageName(Class clazz) { + + private static String getPackageName(Class clazz) { return clazz.getPackage().getName(); } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java index 60e549a..b1aa1c6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java @@ -48,37 +48,37 @@ private static final String PROTO_GEN_CLASS_SUFFIX = "Service"; private static final String PB_IMPL_PACKAGE_SUFFIX = "impl.pb.service"; private static final String PB_IMPL_CLASS_SUFFIX = "PBServiceImpl"; - + private static final RpcServerFactoryPBImpl self = new RpcServerFactoryPBImpl(); private Configuration localConf = new Configuration(); private ConcurrentMap, Constructor> serviceCache = new ConcurrentHashMap, Constructor>(); private ConcurrentMap, Method> protoCache = new ConcurrentHashMap, Method>(); - + public static RpcServerFactoryPBImpl get() { return RpcServerFactoryPBImpl.self; } - + private RpcServerFactoryPBImpl() { } - - public Server getServer(Class protocol, Object instance, + + public Server getServer(Class protocol, T instance, InetSocketAddress addr, Configuration conf, SecretManager secretManager, int numHandlers) { return getServer(protocol, instance, addr, conf, secretManager, numHandlers, null); } - + @Override - public Server getServer(Class protocol, Object instance, + public Server getServer(Class protocol, T instance, InetSocketAddress addr, Configuration conf, SecretManager secretManager, int numHandlers, String portRangeConfig) { - + Constructor constructor = serviceCache.get(protocol); if (constructor == null) { - Class pbServiceImplClazz = null; + Class pbServiceImplClazz; try { pbServiceImplClazz = localConf .getClassByName(getPbServiceImplClassName(protocol)); @@ -96,8 +96,8 @@ public Server getServer(Class protocol, Object instance, + Configuration.class, e); } } - - Object service = null; + + Object service; try { service = constructor.newInstance(instance); } catch (InvocationTargetException e) { @@ -111,7 +111,7 @@ public Server getServer(Class protocol, Object instance, Class pbProtocol = service.getClass().getInterfaces()[0]; Method method = protoCache.get(protocol); if (method == null) { - Class protoClazz = null; + Class protoClazz; try { protoClazz = localConf.getClassByName(getProtoClassName(protocol)); } catch (ClassNotFoundException e) { @@ -127,7 +127,7 @@ public Server getServer(Class protocol, Object instance, throw new YarnRuntimeException(e); } } - + try { return createServer(pbProtocol, addr, conf, secretManager, numHandlers, (BlockingService)method.invoke(null, service), portRangeConfig); @@ -139,31 +139,31 @@ public Server getServer(Class protocol, Object instance, throw new YarnRuntimeException(e); } } - - private String getProtoClassName(Class clazz) { + + private static String getProtoClassName(Class clazz) { String srcClassName = getClassName(clazz); - return PROTO_GEN_PACKAGE_NAME + "." + srcClassName + "$" + srcClassName + PROTO_GEN_CLASS_SUFFIX; + return PROTO_GEN_PACKAGE_NAME + "." + srcClassName + "$" + srcClassName + PROTO_GEN_CLASS_SUFFIX; } - - private String getPbServiceImplClassName(Class clazz) { + + private static String getPbServiceImplClassName(Class clazz) { String srcPackagePart = getPackageName(clazz); String srcClassName = getClassName(clazz); String destPackagePart = srcPackagePart + "." + PB_IMPL_PACKAGE_SUFFIX; String destClassPart = srcClassName + PB_IMPL_CLASS_SUFFIX; return destPackagePart + "." + destClassPart; } - - private String getClassName(Class clazz) { + + private static String getClassName(Class clazz) { String fqName = clazz.getName(); return (fqName.substring(fqName.lastIndexOf(".") + 1, fqName.length())); } - - private String getPackageName(Class clazz) { + + private static String getPackageName(Class clazz) { return clazz.getPackage().getName(); } - private Server createServer(Class pbProtocol, InetSocketAddress addr, Configuration conf, - SecretManager secretManager, int numHandlers, + private static Server createServer(Class pbProtocol, InetSocketAddress addr, Configuration conf, + SecretManager secretManager, int numHandlers, BlockingService blockingService, String portRangeConfig) throws IOException { RPC.setProtocolEngine(conf, pbProtocol, ProtobufRpcEngine.class); RPC.Server server = new RPC.Builder(conf).setProtocol(pbProtocol) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java index 040917d..65d91c0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java @@ -30,9 +30,9 @@ import org.apache.hadoop.yarn.factory.providers.RpcFactoryProvider; /** - * This uses Hadoop RPC. Uses a tunnel ProtoSpecificRpcEngine over + * This uses Hadoop RPC. Uses a tunnel ProtoSpecificRpcEngine over * Hadoop connection. - * This does not give cross-language wire compatibility, since the Hadoop + * This does not give cross-language wire compatibility, since the Hadoop * RPC wire format is non-standard, but it does permit use of Protocol Buffers * protocol versioning features for inter-Java RPCs. */ @@ -42,7 +42,7 @@ private static final Log LOG = LogFactory.getLog(HadoopYarnProtoRPC.class); @Override - public Object getProxy(Class protocol, InetSocketAddress addr, + public T getProxy(Class protocol, InetSocketAddress addr, Configuration conf) { LOG.debug("Creating a HadoopYarnProtoRpc proxy for protocol " + protocol); return RpcFactoryProvider.getClientFactory(conf).getClient(protocol, 1, @@ -55,14 +55,14 @@ public void stopProxy(Object proxy, Configuration conf) { } @Override - public Server getServer(Class protocol, Object instance, + public Server getServer(Class protocol, T instance, InetSocketAddress addr, Configuration conf, SecretManager secretManager, int numHandlers, String portRangeConfig) { - LOG.debug("Creating a HadoopYarnProtoRpc server for protocol " + protocol + + LOG.debug("Creating a HadoopYarnProtoRpc server for protocol " + protocol + " with " + numHandlers + " handlers"); - - return RpcFactoryProvider.getServerFactory(conf).getServer(protocol, + + return RpcFactoryProvider.getServerFactory(conf).getServer(protocol, instance, addr, conf, secretManager, numHandlers, portRangeConfig); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java index 7f9fb77..a643375 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java @@ -36,27 +36,27 @@ @InterfaceAudience.LimitedPrivate({ "MapReduce", "YARN" }) public abstract class YarnRPC { private static final Log LOG = LogFactory.getLog(YarnRPC.class); - - public abstract Object getProxy(Class protocol, InetSocketAddress addr, + + public abstract T getProxy(Class protocol, InetSocketAddress addr, Configuration conf); public abstract void stopProxy(Object proxy, Configuration conf); - public abstract Server getServer(Class protocol, Object instance, + public abstract Server getServer(Class protocol, T instance, InetSocketAddress addr, Configuration conf, SecretManager secretManager, int numHandlers, String portRangeConfig); - public Server getServer(Class protocol, Object instance, + public Server getServer(Class protocol, T instance, InetSocketAddress addr, Configuration conf, SecretManager secretManager, int numHandlers) { return getServer(protocol, instance, addr, conf, secretManager, numHandlers, null); } - + public static YarnRPC create(Configuration conf) { - LOG.debug("Creating YarnRPC for " + + LOG.debug("Creating YarnRPC for " + conf.get(YarnConfiguration.IPC_RPC_IMPL)); String clazzName = conf.get(YarnConfiguration.IPC_RPC_IMPL); if (clazzName == null) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenIdentifier.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenIdentifier.java index 094c133..e4073b7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenIdentifier.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenIdentifier.java @@ -42,18 +42,18 @@ import org.apache.hadoop.yarn.util.Records; /** - * Delegation Token Identifier that identifies the delegation tokens from the - * Resource Manager. + * Delegation Token Identifier that identifies the delegation tokens from the + * Resource Manager. */ @Public @Evolving public class RMDelegationTokenIdentifier extends AbstractDelegationTokenIdentifier { public static final Text KIND_NAME = new Text("RM_DELEGATION_TOKEN"); - + public RMDelegationTokenIdentifier() { } - + /** * Create a new delegation token identifier * @param owner the effective username of the token owner @@ -68,7 +68,7 @@ public RMDelegationTokenIdentifier(Text owner, Text renewer, Text realUser) { public Text getKind() { return KIND_NAME; } - + public static class Renewer extends TokenRenewer { @Override @@ -84,7 +84,7 @@ public boolean isManaged(Token token) throws IOException { private static AbstractDelegationTokenSecretManager localSecretManager; private static InetSocketAddress localServiceAddress; - + @Private public static void setSecretManager( AbstractDelegationTokenSecretManager secretManager, @@ -92,7 +92,7 @@ public static void setSecretManager( localSecretManager = secretManager; localServiceAddress = serviceAddress; } - + @SuppressWarnings("unchecked") @Override public long renew(Token token, Configuration conf) throws IOException, @@ -136,7 +136,7 @@ public void cancel(Token token, Configuration conf) throws IOException, (Token)token, getRenewer(token)); } } - + private static ApplicationClientProtocol getRmClient(Token token, Configuration conf) { InetSocketAddress addr = SecurityUtil.getTokenServiceAddr(token); @@ -152,7 +152,7 @@ private static ApplicationClientProtocol getRmClient(Token token, } } final YarnRPC rpc = YarnRPC.create(conf); - return (ApplicationClientProtocol)rpc.getProxy(ApplicationClientProtocol.class, addr, conf); + return rpc.getProxy(ApplicationClientProtocol.class, addr, conf); } // get renewer so we can always renew our own tokens @@ -161,7 +161,7 @@ private static String getRenewer(Token token) throws IOException { return ((Token)token).decodeIdentifier() .getRenewer().toString(); } - + private static org.apache.hadoop.yarn.api.records.Token convertToProtoToken(Token token) { return org.apache.hadoop.yarn.api.records.Token.newInstance( diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java index 8fe5c3c..1ed2509 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java @@ -87,7 +87,7 @@ private void testRPCTimeout(String rpcClass) throws Exception { server.start(); try { - ContainerManagementProtocol proxy = (ContainerManagementProtocol) rpc.getProxy( + ContainerManagementProtocol proxy = rpc.getProxy( ContainerManagementProtocol.class, server.getListenerAddress(), conf); ContainerLaunchContext containerLaunchContext = recordFactory diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java index 76384d3..155a518 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java @@ -82,7 +82,7 @@ public void testUnknownCall() { server.start(); // Any unrelated protocol would do - ApplicationClientProtocol proxy = (ApplicationClientProtocol) rpc.getProxy( + ApplicationClientProtocol proxy = rpc.getProxy( ApplicationClientProtocol.class, NetUtils.getConnectAddress(server), conf); try { @@ -114,8 +114,7 @@ private void test(String rpcClass) throws Exception { new DummyContainerManager(), addr, conf, null, 1); server.start(); RPC.setProtocolEngine(conf, ContainerManagementProtocolPB.class, ProtobufRpcEngine.class); - ContainerManagementProtocol proxy = (ContainerManagementProtocol) - rpc.getProxy(ContainerManagementProtocol.class, + ContainerManagementProtocol proxy = rpc.getProxy(ContainerManagementProtocol.class, NetUtils.getConnectAddress(server), conf); ContainerLaunchContext containerLaunchContext = recordFactory.newRecordInstance(ContainerLaunchContext.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java index a3c2cce..a2f5705 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java @@ -89,7 +89,7 @@ private void testPbClientFactory() { ApplicationMasterProtocol amrmClient = null; try { - amrmClient = (ApplicationMasterProtocol) RpcClientFactoryPBImpl.get().getClient(ApplicationMasterProtocol.class, 1, NetUtils.getConnectAddress(server), conf); + amrmClient = RpcClientFactoryPBImpl.get().getClient(ApplicationMasterProtocol.class, 1, NetUtils.getConnectAddress(server), conf); } catch (YarnRuntimeException e) { e.printStackTrace(); Assert.fail("Failed to create client"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ServerRMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ServerRMProxy.java index 0f90310..4c76006 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ServerRMProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ServerRMProxy.java @@ -27,7 +27,7 @@ import org.apache.hadoop.yarn.client.RMProxy; import org.apache.hadoop.yarn.conf.YarnConfiguration; -public class ServerRMProxy extends RMProxy { +public class ServerRMProxy extends RMProxy { private static final Log LOG = LogFactory.getLog(ServerRMProxy.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java index c2decf3..ba01b93 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestRPCFactories.java @@ -85,7 +85,7 @@ private void testPbClientFactory() { ResourceTracker client = null; try { - client = (ResourceTracker) RpcClientFactoryPBImpl.get().getClient(ResourceTracker.class, 1, NetUtils.getConnectAddress(server), conf); + client = RpcClientFactoryPBImpl.get().getClient(ResourceTracker.class, 1, NetUtils.getConnectAddress(server), conf); } catch (YarnRuntimeException e) { e.printStackTrace(); Assert.fail("Failed to create client"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java index 51ce9e2..1e9ae56 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ContainerLocalizer.java @@ -115,8 +115,7 @@ public ContainerLocalizer(FileContext lfs, String user, String appId, LocalizationProtocol getProxy(final InetSocketAddress nmAddr) { YarnRPC rpc = YarnRPC.create(conf); - return (LocalizationProtocol) - rpc.getProxy(LocalizationProtocol.class, nmAddr, conf); + return rpc.getProxy(LocalizationProtocol.class, nmAddr, conf); } @SuppressWarnings("deprecation") @@ -134,7 +133,7 @@ public int runLocalization(final InetSocketAddress nmAddr) credFile = lfs.open(tokenPath); creds.readTokenStorageStream(credFile); // Explicitly deleting token file. - lfs.delete(tokenPath, false); + lfs.delete(tokenPath, false); } finally { if (credFile != null) { credFile.close(); @@ -266,7 +265,7 @@ protected void localizeFiles(LocalizationProtocol nodemanager, /** * Create the payload for the HeartBeat. Mainly the list of * {@link LocalResourceStatus}es - * + * * @return a {@link LocalizerStatus} that can be sent via heartbeat. * @throws InterruptedException */ diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java index f1611a7..949705f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java @@ -203,7 +203,7 @@ public ContainerManagementProtocol run() { YarnRPC rpc = YarnRPC.create(conf); InetSocketAddress containerManagerBindAddress = NetUtils.createSocketAddrForHost("127.0.0.1", 12345); - return (ContainerManagementProtocol) rpc.getProxy(ContainerManagementProtocol.class, + return rpc.getProxy(ContainerManagementProtocol.class, containerManagerBindAddress, conf); } }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestRPCFactories.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestRPCFactories.java index f207f26..3d83afb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestRPCFactories.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestRPCFactories.java @@ -82,7 +82,7 @@ private void testPbClientFactory() { System.err.println(NetUtils.getConnectAddress(server)); try { - LocalizationProtocol client = (LocalizationProtocol) + LocalizationProtocol client = RpcClientFactoryPBImpl.get().getClient( LocalizationProtocol.class, 1, NetUtils.getConnectAddress(server), conf); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java index a1c1a40..05e3c5c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java @@ -77,10 +77,10 @@ private final AMLauncherEventType eventType; private final RMContext rmContext; private final Container masterContainer; - + @SuppressWarnings("rawtypes") private final EventHandler handler; - + public AMLauncher(RMContext rmContext, RMAppAttempt application, AMLauncherEventType eventType, Configuration conf) { this.application = application; @@ -90,20 +90,20 @@ public AMLauncher(RMContext rmContext, RMAppAttempt application, this.handler = rmContext.getDispatcher().getEventHandler(); this.masterContainer = application.getMasterContainer(); } - + private void connect() throws IOException { ContainerId masterContainerID = masterContainer.getId(); - + containerMgrProxy = getContainerMgrProxy(masterContainerID); } - + private void launch() throws IOException, YarnException { connect(); ContainerId masterContainerID = masterContainer.getId(); ApplicationSubmissionContext applicationContext = application.getSubmissionContext(); LOG.info("Setting up container " + masterContainer - + " for AM " + application.getAppAttemptId()); + + " for AM " + application.getAppAttemptId()); ContainerLaunchContext launchContext = createAMContainerLaunchContext(applicationContext, masterContainerID); @@ -127,7 +127,7 @@ private void launch() throws IOException, YarnException { + application.getAppAttemptId()); } } - + private void cleanup() throws IOException, YarnException { connect(); ContainerId containerId = masterContainer.getId(); @@ -173,7 +173,7 @@ protected ContainerManagementProtocol getContainerMgrProxy( @Override public ContainerManagementProtocol run() { - return (ContainerManagementProtocol) rpc.getProxy( + return rpc.getProxy( ContainerManagementProtocol.class, containerManagerBindAddress, conf); } @@ -185,17 +185,17 @@ private ContainerLaunchContext createAMContainerLaunchContext( ContainerId containerID) throws IOException { // Construct the actual Container - ContainerLaunchContext container = + ContainerLaunchContext container = applicationMasterContext.getAMContainerSpec(); LOG.info("Command to launch container " + containerID + " : " + StringUtils.arrayToString(container.getCommands().toArray( new String[0]))); - + // Finalize the container setupTokens(container, containerID); - + return container; } @@ -239,7 +239,7 @@ private void setupTokens( protected Token getAMRMToken() { return application.getAMRMToken(); } - + @SuppressWarnings("unchecked") public void run() { switch (eventType) { @@ -269,7 +269,7 @@ public void run() { sb.append(" is not handled by this NodeManager"); if (!e.getMessage().contains(sb.toString())) { // Ignoring if container is already killed by Node Manager. - LOG.info("Error cleaning master ", e); + LOG.info("Error cleaning master ", e); } } break; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java index a9f1c1a..72decfb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java @@ -205,7 +205,7 @@ public void testAuthorizedAccess() throws Exception { .doAs(new PrivilegedAction() { @Override public ApplicationMasterProtocol run() { - return (ApplicationMasterProtocol) rpc.getProxy(ApplicationMasterProtocol.class, rm + return rpc.getProxy(ApplicationMasterProtocol.class, rm .getApplicationMasterService().getBindAddress(), conf); } }); @@ -261,7 +261,7 @@ public void testUnauthorizedAccess() throws Exception { .doAs(new PrivilegedAction() { @Override public ApplicationMasterProtocol run() { - return (ApplicationMasterProtocol) rpc.getProxy(ApplicationMasterProtocol.class, + return rpc.getProxy(ApplicationMasterProtocol.class, serviceAddr, conf); } }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java index e31aaa8..e4d3756 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java @@ -152,7 +152,7 @@ public void run() { rmClient = owner.doAs(new PrivilegedExceptionAction() { @Override public ApplicationClientProtocol run() throws Exception { - return (ApplicationClientProtocol) rpc.getProxy(ApplicationClientProtocol.class, + return rpc.getProxy(ApplicationClientProtocol.class, rmAddress, conf); } }); @@ -216,7 +216,7 @@ private ApplicationClientProtocol getRMClientForUser(String user) .doAs(new PrivilegedExceptionAction() { @Override public ApplicationClientProtocol run() throws Exception { - return (ApplicationClientProtocol) rpc.getProxy(ApplicationClientProtocol.class, + return rpc.getProxy(ApplicationClientProtocol.class, rmAddress, conf); } }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java index 9ec82c4..34477e0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java @@ -150,8 +150,7 @@ protected ClientRMService createClientRMService() { InetSocketAddress rmAddress = rm.getClientRMService().getBindAddress(); LOG.info("Connecting to ResourceManager at " + rmAddress); ApplicationClientProtocol client = - (ApplicationClientProtocol) rpc - .getProxy(ApplicationClientProtocol.class, rmAddress, conf); + rpc.getProxy(ApplicationClientProtocol.class, rmAddress, conf); // Make call GetClusterNodesRequest request = diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java index d389c0e..8db9282 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java @@ -417,7 +417,7 @@ private ApplicationClientProtocol getClientRMProtocolWithDT( .doAs(new PrivilegedAction() { @Override public ApplicationClientProtocol run() { - return (ApplicationClientProtocol) rpc.getProxy(ApplicationClientProtocol.class, + return rpc.getProxy(ApplicationClientProtocol.class, rmAddress, conf); } }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestQueueACLs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestQueueACLs.java index 9714b4c..d7aed17 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestQueueACLs.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestQueueACLs.java @@ -255,7 +255,7 @@ private ApplicationClientProtocol getRMClientForUser(String user) .doAs(new PrivilegedExceptionAction() { @Override public ApplicationClientProtocol run() throws Exception { - return (ApplicationClientProtocol) rpc.getProxy( + return rpc.getProxy( ApplicationClientProtocol.class, rmAddress, conf); } }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerUtils.java index 9969db5..28ef8a5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerUtils.java @@ -315,7 +315,7 @@ public void testValidateResourceBlacklistRequest() throws Exception { currentUser.doAs(new PrivilegedAction() { @Override public ApplicationMasterProtocol run() { - return (ApplicationMasterProtocol) rpc.getProxy( + return rpc.getProxy( ApplicationMasterProtocol.class, rmBindAddress, conf); } }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java index aa894c5..9b12be5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java @@ -267,7 +267,7 @@ private ApplicationMasterProtocol createRMClient(final MockRM rm, return currentUser.doAs(new PrivilegedAction() { @Override public ApplicationMasterProtocol run() { - return (ApplicationMasterProtocol) rpc.getProxy(ApplicationMasterProtocol.class, rm + return rpc.getProxy(ApplicationMasterProtocol.class, rm .getApplicationMasterService().getBindAddress(), conf); } }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java index 0a62f36..616a313 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java @@ -493,7 +493,7 @@ protected ContainerManagementProtocol getContainerManagementProtocolProxy( @Override public ContainerManagementProtocol run() { - return (ContainerManagementProtocol) rpc.getProxy( + return rpc.getProxy( ContainerManagementProtocol.class, addr, conf); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/AppReportFetcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/AppReportFetcher.java index 077783f..9e56d82 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/AppReportFetcher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/AppReportFetcher.java @@ -56,8 +56,7 @@ public AppReportFetcher(Configuration conf) { YarnConfiguration.DEFAULT_RM_ADDRESS, YarnConfiguration.DEFAULT_RM_PORT); LOG.info("Connecting to ResourceManager at " + rmAddress); - applicationsManager = - (ApplicationClientProtocol) rpc.getProxy(ApplicationClientProtocol.class, + applicationsManager = rpc.getProxy(ApplicationClientProtocol.class, rmAddress, this.conf); LOG.info("Connected to ResourceManager at " + rmAddress); }