Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java Thu Mar 29 02:02:17 2012 @@ -26,15 +26,15 @@ import org.apache.hadoop.security.Securi import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.security.token.TokenInfo; import org.apache.hadoop.security.token.TokenSelector; +import org.apache.hadoop.yarn.api.ClientRMProtocolPB; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.proto.ClientRMProtocol; public class ClientRMSecurityInfo extends SecurityInfo { @Override public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) { if (!protocol - .equals(ClientRMProtocol.ClientRMProtocolService.BlockingInterface.class)) { + .equals(ClientRMProtocolPB.class)) { return null; } return new KerberosInfo() { @@ -59,7 +59,7 @@ public class ClientRMSecurityInfo extend @Override public TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) { if (!protocol - .equals(ClientRMProtocol.ClientRMProtocolService.BlockingInterface.class)) { + .equals(ClientRMProtocolPB.class)) { return null; } return new TokenInfo() {
Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java Thu Mar 29 02:02:17 2012 @@ -22,11 +22,14 @@ import java.net.InetSocketAddress; import junit.framework.Assert; -import org.apache.hadoop.ipc.Server; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.ipc.ProtobufRpcEngine; +import org.apache.hadoop.ipc.RPC; +import org.apache.hadoop.ipc.Server; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.ContainerManager; +import org.apache.hadoop.yarn.api.ContainerManagerPB; import org.apache.hadoop.yarn.api.protocolrecords.GetContainerStatusRequest; import org.apache.hadoop.yarn.api.protocolrecords.GetContainerStatusResponse; import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest; @@ -84,6 +87,8 @@ public class TestRPC { "Unknown method getNewApplication called on.*" + "org.apache.hadoop.yarn.proto.ClientRMProtocol" + "\\$ClientRMProtocolService\\$BlockingInterface protocol.")); + } catch (Exception e) { + e.printStackTrace(); } } @@ -101,6 +106,7 @@ public class TestRPC { Server server = rpc.getServer(ContainerManager.class, new DummyContainerManager(), addr, conf, null, 1); server.start(); + RPC.setProtocolEngine(conf, ContainerManagerPB.class, ProtobufRpcEngine.class); ContainerManager proxy = (ContainerManager) rpc.getProxy(ContainerManager.class, NetUtils.createSocketAddr("localhost:" + server.getPort()), conf); @@ -144,11 +150,11 @@ public class TestRPC { proxy.stopContainer(stopRequest); } catch (YarnRemoteException e) { exception = true; - System.err.println(e.getMessage()); - System.err.println(e.getCause().getMessage()); - Assert.assertTrue(EXCEPTION_MSG.equals(e.getMessage())); - Assert.assertTrue(EXCEPTION_CAUSE.equals(e.getCause().getMessage())); + Assert.assertTrue(e.getMessage().contains(EXCEPTION_MSG)); + Assert.assertTrue(e.getMessage().contains(EXCEPTION_CAUSE)); System.out.println("Test Exception is " + RPCUtil.toString(e)); + } catch (Exception ex) { + ex.printStackTrace(); } Assert.assertTrue(exception); Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/RMNMSecurityInfoClass.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/RMNMSecurityInfoClass.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/RMNMSecurityInfoClass.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/RMNMSecurityInfoClass.java Thu Mar 29 02:02:17 2012 @@ -25,13 +25,13 @@ import org.apache.hadoop.security.Kerber 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.proto.ResourceTracker; +import org.apache.hadoop.yarn.server.api.ResourceTrackerPB; public class RMNMSecurityInfoClass extends SecurityInfo { @Override public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) { - if (!protocol.equals(ResourceTracker.ResourceTrackerService.BlockingInterface.class)) { + if (!protocol.equals(ResourceTrackerPB.class)) { return null; } return new KerberosInfo() { Added: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ResourceTrackerPB.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ResourceTrackerPB.java?rev=1306689&view=auto ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ResourceTrackerPB.java (added) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ResourceTrackerPB.java Thu Mar 29 02:02:17 2012 @@ -0,0 +1,28 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.yarn.server.api; + +import org.apache.hadoop.ipc.ProtocolInfo; +import org.apache.hadoop.yarn.proto.ResourceTracker.ResourceTrackerService; + +@ProtocolInfo( + protocolName = "org.apache.hadoop.yarn.server.api.ResourceTrackerPB", + protocolVersion = 1) +public interface ResourceTrackerPB extends ResourceTrackerService.BlockingInterface { + +} Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/ResourceTrackerPBClientImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/ResourceTrackerPBClientImpl.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/ResourceTrackerPBClientImpl.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/ResourceTrackerPBClientImpl.java Thu Mar 29 02:02:17 2012 @@ -19,17 +19,17 @@ package org.apache.hadoop.yarn.server.api.impl.pb.client; import java.io.IOException; -import java.lang.reflect.UndeclaredThrowableException; import java.net.InetSocketAddress; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.ipc.ProtobufRpcEngine; import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; -import org.apache.hadoop.yarn.ipc.ProtoOverHadoopRpcEngine; -import org.apache.hadoop.yarn.proto.ResourceTracker.ResourceTrackerService; +import org.apache.hadoop.yarn.exceptions.impl.pb.YarnRemoteExceptionPBImpl; import org.apache.hadoop.yarn.proto.YarnServerCommonServiceProtos.NodeHeartbeatRequestProto; import org.apache.hadoop.yarn.proto.YarnServerCommonServiceProtos.RegisterNodeManagerRequestProto; import org.apache.hadoop.yarn.server.api.ResourceTracker; +import org.apache.hadoop.yarn.server.api.ResourceTrackerPB; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatRequest; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; import org.apache.hadoop.yarn.server.api.protocolrecords.RegisterNodeManagerRequest; @@ -43,12 +43,12 @@ import com.google.protobuf.ServiceExcept public class ResourceTrackerPBClientImpl implements ResourceTracker { -private ResourceTrackerService.BlockingInterface proxy; +private ResourceTrackerPB proxy; public ResourceTrackerPBClientImpl(long clientVersion, InetSocketAddress addr, Configuration conf) throws IOException { - RPC.setProtocolEngine(conf, ResourceTrackerService.BlockingInterface.class, ProtoOverHadoopRpcEngine.class); - proxy = (ResourceTrackerService.BlockingInterface)RPC.getProxy( - ResourceTrackerService.BlockingInterface.class, clientVersion, addr, conf); + RPC.setProtocolEngine(conf, ResourceTrackerPB.class, ProtobufRpcEngine.class); + proxy = (ResourceTrackerPB)RPC.getProxy( + ResourceTrackerPB.class, clientVersion, addr, conf); } @Override @@ -58,13 +58,7 @@ private ResourceTrackerService.BlockingI try { return new RegisterNodeManagerResponsePBImpl(proxy.registerNodeManager(null, requestProto)); } catch (ServiceException e) { - if (e.getCause() instanceof YarnRemoteException) { - throw (YarnRemoteException)e.getCause(); - } else if (e.getCause() instanceof UndeclaredThrowableException) { - throw (UndeclaredThrowableException)e.getCause(); - } else { - throw new UndeclaredThrowableException(e); - } + throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e); } } @@ -75,13 +69,7 @@ private ResourceTrackerService.BlockingI try { return new NodeHeartbeatResponsePBImpl(proxy.nodeHeartbeat(null, requestProto)); } catch (ServiceException e) { - if (e.getCause() instanceof YarnRemoteException) { - throw (YarnRemoteException)e.getCause(); - } else if (e.getCause() instanceof UndeclaredThrowableException) { - throw (UndeclaredThrowableException)e.getCause(); - } else { - throw new UndeclaredThrowableException(e); - } + throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e); } } Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/service/ResourceTrackerPBServiceImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/service/ResourceTrackerPBServiceImpl.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/service/ResourceTrackerPBServiceImpl.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/service/ResourceTrackerPBServiceImpl.java Thu Mar 29 02:02:17 2012 @@ -19,12 +19,12 @@ package org.apache.hadoop.yarn.server.api.impl.pb.service; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; -import org.apache.hadoop.yarn.proto.ResourceTracker.ResourceTrackerService.BlockingInterface; import org.apache.hadoop.yarn.proto.YarnServerCommonServiceProtos.NodeHeartbeatRequestProto; import org.apache.hadoop.yarn.proto.YarnServerCommonServiceProtos.NodeHeartbeatResponseProto; import org.apache.hadoop.yarn.proto.YarnServerCommonServiceProtos.RegisterNodeManagerRequestProto; import org.apache.hadoop.yarn.proto.YarnServerCommonServiceProtos.RegisterNodeManagerResponseProto; import org.apache.hadoop.yarn.server.api.ResourceTracker; +import org.apache.hadoop.yarn.server.api.ResourceTrackerPB; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; import org.apache.hadoop.yarn.server.api.protocolrecords.RegisterNodeManagerResponse; import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.NodeHeartbeatRequestPBImpl; @@ -35,7 +35,7 @@ import org.apache.hadoop.yarn.server.api import com.google.protobuf.RpcController; import com.google.protobuf.ServiceException; -public class ResourceTrackerPBServiceImpl implements BlockingInterface { +public class ResourceTrackerPBServiceImpl implements ResourceTrackerPB { private ResourceTracker real; Added: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/LocalizationProtocolPB.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/LocalizationProtocolPB.java?rev=1306689&view=auto ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/LocalizationProtocolPB.java (added) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/LocalizationProtocolPB.java Thu Mar 29 02:02:17 2012 @@ -0,0 +1,27 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.yarn.server.nodemanager.api; + +import org.apache.hadoop.ipc.ProtocolInfo; +import org.apache.hadoop.yarn.proto.LocalizationProtocol.LocalizationProtocolService; + +@ProtocolInfo(protocolName = "org.apache.hadoop.yarn.server.nodemanager.api.LocalizationProtocolPB", + protocolVersion = 1) +public interface LocalizationProtocolPB extends LocalizationProtocolService.BlockingInterface { + +} Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/impl/pb/client/LocalizationProtocolPBClientImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/impl/pb/client/LocalizationProtocolPBClientImpl.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/impl/pb/client/LocalizationProtocolPBClientImpl.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/impl/pb/client/LocalizationProtocolPBClientImpl.java Thu Mar 29 02:02:17 2012 @@ -18,32 +18,31 @@ package org.apache.hadoop.yarn.server.nodemanager.api.impl.pb.client; import java.io.IOException; - -import java.lang.reflect.UndeclaredThrowableException; import java.net.InetSocketAddress; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.ipc.ProtobufRpcEngine; import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; -import org.apache.hadoop.yarn.ipc.ProtoOverHadoopRpcEngine; -import org.apache.hadoop.yarn.proto.LocalizationProtocol.LocalizationProtocolService; +import org.apache.hadoop.yarn.exceptions.impl.pb.YarnRemoteExceptionPBImpl; +import org.apache.hadoop.yarn.proto.YarnServerNodemanagerServiceProtos.LocalizerStatusProto; import org.apache.hadoop.yarn.server.nodemanager.api.LocalizationProtocol; +import org.apache.hadoop.yarn.server.nodemanager.api.LocalizationProtocolPB; import org.apache.hadoop.yarn.server.nodemanager.api.protocolrecords.LocalizerHeartbeatResponse; import org.apache.hadoop.yarn.server.nodemanager.api.protocolrecords.LocalizerStatus; import org.apache.hadoop.yarn.server.nodemanager.api.protocolrecords.impl.pb.LocalizerHeartbeatResponsePBImpl; import org.apache.hadoop.yarn.server.nodemanager.api.protocolrecords.impl.pb.LocalizerStatusPBImpl; -import static org.apache.hadoop.yarn.proto.YarnServerNodemanagerServiceProtos.LocalizerStatusProto; import com.google.protobuf.ServiceException; public class LocalizationProtocolPBClientImpl implements LocalizationProtocol { - private LocalizationProtocolService.BlockingInterface proxy; + private LocalizationProtocolPB proxy; public LocalizationProtocolPBClientImpl(long clientVersion, InetSocketAddress addr, Configuration conf) throws IOException { - RPC.setProtocolEngine(conf, LocalizationProtocolService.BlockingInterface.class, ProtoOverHadoopRpcEngine.class); - proxy = (LocalizationProtocolService.BlockingInterface)RPC.getProxy( - LocalizationProtocolService.BlockingInterface.class, clientVersion, addr, conf); + RPC.setProtocolEngine(conf, LocalizationProtocolPB.class, ProtobufRpcEngine.class); + proxy = (LocalizationProtocolPB)RPC.getProxy( + LocalizationProtocolPB.class, clientVersion, addr, conf); } @Override @@ -54,13 +53,7 @@ public class LocalizationProtocolPBClien return new LocalizerHeartbeatResponsePBImpl( proxy.heartbeat(null, statusProto)); } catch (ServiceException e) { - if (e.getCause() instanceof YarnRemoteException) { - throw (YarnRemoteException)e.getCause(); - } else if (e.getCause() instanceof UndeclaredThrowableException) { - throw (UndeclaredThrowableException)e.getCause(); - } else { - throw new UndeclaredThrowableException(e); - } + throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e); } } Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/impl/pb/service/LocalizationProtocolPBServiceImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/impl/pb/service/LocalizationProtocolPBServiceImpl.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/impl/pb/service/LocalizationProtocolPBServiceImpl.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/api/impl/pb/service/LocalizationProtocolPBServiceImpl.java Thu Mar 29 02:02:17 2012 @@ -24,13 +24,13 @@ import com.google.protobuf.RpcController import com.google.protobuf.ServiceException; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; -import org.apache.hadoop.yarn.proto.LocalizationProtocol.LocalizationProtocolService.BlockingInterface; import org.apache.hadoop.yarn.proto.YarnServerNodemanagerServiceProtos.LocalizerHeartbeatResponseProto; import org.apache.hadoop.yarn.proto.YarnServerNodemanagerServiceProtos.LocalizerStatusProto; import org.apache.hadoop.yarn.server.nodemanager.api.LocalizationProtocol; +import org.apache.hadoop.yarn.server.nodemanager.api.LocalizationProtocolPB; import org.apache.hadoop.yarn.server.nodemanager.api.protocolrecords.LocalizerHeartbeatResponse; -public class LocalizationProtocolPBServiceImpl implements BlockingInterface { +public class LocalizationProtocolPBServiceImpl implements LocalizationProtocolPB { private LocalizationProtocol real; Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-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/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerSecurityInfo.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerSecurityInfo.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerSecurityInfo.java Thu Mar 29 02:02:17 2012 @@ -26,7 +26,7 @@ import org.apache.hadoop.security.Securi import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.security.token.TokenInfo; import org.apache.hadoop.security.token.TokenSelector; -import org.apache.hadoop.yarn.proto.LocalizationProtocol; +import org.apache.hadoop.yarn.server.nodemanager.api.LocalizationProtocolPB; public class LocalizerSecurityInfo extends SecurityInfo { @@ -38,7 +38,7 @@ public class LocalizerSecurityInfo exten @Override public TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) { if (!protocol - .equals(LocalizationProtocol.LocalizationProtocolService.BlockingInterface.class)) { + .equals(LocalizationProtocolPB.class)) { return null; } return new TokenInfo() { Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/authorize/NMPolicyProvider.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/authorize/NMPolicyProvider.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/authorize/NMPolicyProvider.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/security/authorize/NMPolicyProvider.java Thu Mar 29 02:02:17 2012 @@ -21,9 +21,9 @@ import org.apache.hadoop.classification. import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.security.authorize.PolicyProvider; import org.apache.hadoop.security.authorize.Service; -import org.apache.hadoop.yarn.proto.ContainerManager; +import org.apache.hadoop.yarn.api.ContainerManagerPB; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.proto.LocalizationProtocol; +import org.apache.hadoop.yarn.server.nodemanager.api.LocalizationProtocolPB; /** * {@link PolicyProvider} for YARN NodeManager protocols. @@ -36,9 +36,9 @@ public class NMPolicyProvider extends Po new Service[] { new Service( YarnConfiguration.YARN_SECURITY_SERVICE_AUTHORIZATION_CONTAINER_MANAGER, - ContainerManager.ContainerManagerService.BlockingInterface.class), + ContainerManagerPB.class), new Service(YarnConfiguration.YARN_SECURITY_SERVICE_AUTHORIZATION_RESOURCE_LOCALIZER, - LocalizationProtocol.LocalizationProtocolService.BlockingInterface.class) + LocalizationProtocolPB.class) }; @Override Added: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/RMAdminProtocolPB.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/RMAdminProtocolPB.java?rev=1306689&view=auto ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/RMAdminProtocolPB.java (added) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/RMAdminProtocolPB.java Thu Mar 29 02:02:17 2012 @@ -0,0 +1,28 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.yarn.server.resourcemanager.api; + +import org.apache.hadoop.ipc.ProtocolInfo; +import org.apache.hadoop.yarn.proto.RMAdminProtocol.RMAdminProtocolService; + +@ProtocolInfo( + protocolName = "org.apache.hadoop.yarn.server.nodemanager.api.RMAdminProtocolPB", + protocolVersion = 1) +public interface RMAdminProtocolPB extends RMAdminProtocolService.BlockingInterface { + +} Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/impl/pb/client/RMAdminProtocolPBClientImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/impl/pb/client/RMAdminProtocolPBClientImpl.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/impl/pb/client/RMAdminProtocolPBClientImpl.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/impl/pb/client/RMAdminProtocolPBClientImpl.java Thu Mar 29 02:02:17 2012 @@ -23,10 +23,10 @@ import java.lang.reflect.UndeclaredThrow import java.net.InetSocketAddress; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.ipc.ProtobufRpcEngine; import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; -import org.apache.hadoop.yarn.ipc.ProtoOverHadoopRpcEngine; -import org.apache.hadoop.yarn.proto.RMAdminProtocol.RMAdminProtocolService; +import org.apache.hadoop.yarn.exceptions.impl.pb.YarnRemoteExceptionPBImpl; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshAdminAclsRequestProto; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshNodesRequestProto; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshQueuesRequestProto; @@ -34,6 +34,7 @@ import org.apache.hadoop.yarn.proto.Yarn import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshSuperUserGroupsConfigurationRequestProto; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshUserToGroupsMappingsRequestProto; import org.apache.hadoop.yarn.server.resourcemanager.api.RMAdminProtocol; +import org.apache.hadoop.yarn.server.resourcemanager.api.RMAdminProtocolPB; import org.apache.hadoop.yarn.server.resourcemanager.api.protocolrecords.RefreshAdminAclsRequest; import org.apache.hadoop.yarn.server.resourcemanager.api.protocolrecords.RefreshAdminAclsResponse; import org.apache.hadoop.yarn.server.resourcemanager.api.protocolrecords.RefreshNodesRequest; @@ -64,14 +65,14 @@ import com.google.protobuf.ServiceExcept public class RMAdminProtocolPBClientImpl implements RMAdminProtocol { - private RMAdminProtocolService.BlockingInterface proxy; + private RMAdminProtocolPB proxy; public RMAdminProtocolPBClientImpl(long clientVersion, InetSocketAddress addr, Configuration conf) throws IOException { - RPC.setProtocolEngine(conf, RMAdminProtocolService.BlockingInterface.class, - ProtoOverHadoopRpcEngine.class); - proxy = (RMAdminProtocolService.BlockingInterface)RPC.getProxy( - RMAdminProtocolService.BlockingInterface.class, clientVersion, addr, conf); + RPC.setProtocolEngine(conf, RMAdminProtocolPB.class, + ProtobufRpcEngine.class); + proxy = (RMAdminProtocolPB)RPC.getProxy( + RMAdminProtocolPB.class, clientVersion, addr, conf); } @Override @@ -83,13 +84,7 @@ public class RMAdminProtocolPBClientImpl return new RefreshQueuesResponsePBImpl( proxy.refreshQueues(null, requestProto)); } catch (ServiceException e) { - if (e.getCause() instanceof YarnRemoteException) { - throw (YarnRemoteException)e.getCause(); - } else if (e.getCause() instanceof UndeclaredThrowableException) { - throw (UndeclaredThrowableException)e.getCause(); - } else { - throw new UndeclaredThrowableException(e); - } + throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e); } } @@ -102,13 +97,7 @@ public class RMAdminProtocolPBClientImpl return new RefreshNodesResponsePBImpl( proxy.refreshNodes(null, requestProto)); } catch (ServiceException e) { - if (e.getCause() instanceof YarnRemoteException) { - throw (YarnRemoteException)e.getCause(); - } else if (e.getCause() instanceof UndeclaredThrowableException) { - throw (UndeclaredThrowableException)e.getCause(); - } else { - throw new UndeclaredThrowableException(e); - } + throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e); } } @@ -122,13 +111,7 @@ public class RMAdminProtocolPBClientImpl return new RefreshSuperUserGroupsConfigurationResponsePBImpl( proxy.refreshSuperUserGroupsConfiguration(null, requestProto)); } catch (ServiceException e) { - if (e.getCause() instanceof YarnRemoteException) { - throw (YarnRemoteException)e.getCause(); - } else if (e.getCause() instanceof UndeclaredThrowableException) { - throw (UndeclaredThrowableException)e.getCause(); - } else { - throw new UndeclaredThrowableException(e); - } + throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e); } } @@ -141,13 +124,7 @@ public class RMAdminProtocolPBClientImpl return new RefreshUserToGroupsMappingsResponsePBImpl( proxy.refreshUserToGroupsMappings(null, requestProto)); } catch (ServiceException e) { - if (e.getCause() instanceof YarnRemoteException) { - throw (YarnRemoteException)e.getCause(); - } else if (e.getCause() instanceof UndeclaredThrowableException) { - throw (UndeclaredThrowableException)e.getCause(); - } else { - throw new UndeclaredThrowableException(e); - } + throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e); } } @@ -160,13 +137,7 @@ public class RMAdminProtocolPBClientImpl return new RefreshAdminAclsResponsePBImpl( proxy.refreshAdminAcls(null, requestProto)); } catch (ServiceException e) { - if (e.getCause() instanceof YarnRemoteException) { - throw (YarnRemoteException)e.getCause(); - } else if (e.getCause() instanceof UndeclaredThrowableException) { - throw (UndeclaredThrowableException)e.getCause(); - } else { - throw new UndeclaredThrowableException(e); - } + throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e); } } @@ -175,18 +146,12 @@ public class RMAdminProtocolPBClientImpl RefreshServiceAclsRequest request) throws YarnRemoteException { RefreshServiceAclsRequestProto requestProto = ((RefreshServiceAclsRequestPBImpl)request).getProto(); - try { - return new RefreshServiceAclsResponsePBImpl( - proxy.refreshServiceAcls(null, requestProto)); - } catch (ServiceException e) { - if (e.getCause() instanceof YarnRemoteException) { - throw (YarnRemoteException)e.getCause(); - } else if (e.getCause() instanceof UndeclaredThrowableException) { - throw (UndeclaredThrowableException)e.getCause(); - } else { - throw new UndeclaredThrowableException(e); - } - } + try { + return new RefreshServiceAclsResponsePBImpl(proxy.refreshServiceAcls( + null, requestProto)); + } catch (ServiceException e) { + throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e); + } } Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/impl/pb/service/RMAdminProtocolPBServiceImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/impl/pb/service/RMAdminProtocolPBServiceImpl.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/impl/pb/service/RMAdminProtocolPBServiceImpl.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/api/impl/pb/service/RMAdminProtocolPBServiceImpl.java Thu Mar 29 02:02:17 2012 @@ -19,11 +19,11 @@ package org.apache.hadoop.yarn.server.resourcemanager.api.impl.pb.service; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; -import org.apache.hadoop.yarn.proto.RMAdminProtocol.RMAdminProtocolService.BlockingInterface; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshServiceAclsRequestProto; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshServiceAclsResponseProto; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.*; import org.apache.hadoop.yarn.server.resourcemanager.api.RMAdminProtocol; +import org.apache.hadoop.yarn.server.resourcemanager.api.RMAdminProtocolPB; import org.apache.hadoop.yarn.server.resourcemanager.api.protocolrecords.RefreshAdminAclsResponse; import org.apache.hadoop.yarn.server.resourcemanager.api.protocolrecords.RefreshNodesResponse; import org.apache.hadoop.yarn.server.resourcemanager.api.protocolrecords.RefreshQueuesResponse; @@ -46,7 +46,7 @@ import org.apache.hadoop.yarn.server.res import com.google.protobuf.RpcController; import com.google.protobuf.ServiceException; -public class RMAdminProtocolPBServiceImpl implements BlockingInterface { +public class RMAdminProtocolPBServiceImpl implements RMAdminProtocolPB { private RMAdminProtocol real; Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/admin/AdminSecurityInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/admin/AdminSecurityInfo.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/admin/AdminSecurityInfo.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/admin/AdminSecurityInfo.java Thu Mar 29 02:02:17 2012 @@ -25,13 +25,13 @@ import org.apache.hadoop.security.Kerber 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.proto.RMAdminProtocol; +import org.apache.hadoop.yarn.server.resourcemanager.api.RMAdminProtocolPB; public class AdminSecurityInfo extends SecurityInfo { @Override public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) { - if (!protocol.equals(RMAdminProtocol.RMAdminProtocolService.BlockingInterface.class)) { + if (!protocol.equals(RMAdminProtocolPB.class)) { return null; } return new KerberosInfo() { Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/authorize/RMPolicyProvider.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/authorize/RMPolicyProvider.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/authorize/RMPolicyProvider.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/authorize/RMPolicyProvider.java Thu Mar 29 02:02:17 2012 @@ -21,12 +21,12 @@ import org.apache.hadoop.classification. import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.security.authorize.PolicyProvider; import org.apache.hadoop.security.authorize.Service; +import org.apache.hadoop.yarn.api.AMRMProtocolPB; +import org.apache.hadoop.yarn.api.ClientRMProtocolPB; +import org.apache.hadoop.yarn.api.ContainerManagerPB; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.proto.ContainerManager; -import org.apache.hadoop.yarn.proto.ResourceTracker; -import org.apache.hadoop.yarn.proto.RMAdminProtocol; -import org.apache.hadoop.yarn.proto.ClientRMProtocol; -import org.apache.hadoop.yarn.proto.AMRMProtocol; +import org.apache.hadoop.yarn.server.api.ResourceTrackerPB; +import org.apache.hadoop.yarn.server.resourcemanager.api.RMAdminProtocolPB; /** * {@link PolicyProvider} for YARN ResourceManager protocols. @@ -39,19 +39,19 @@ public class RMPolicyProvider extends Po new Service[] { new Service( YarnConfiguration.YARN_SECURITY_SERVICE_AUTHORIZATION_RESOURCETRACKER, - ResourceTracker.ResourceTrackerService.BlockingInterface.class), + ResourceTrackerPB.class), new Service( YarnConfiguration.YARN_SECURITY_SERVICE_AUTHORIZATION_CLIENT_RESOURCEMANAGER, - ClientRMProtocol.ClientRMProtocolService.BlockingInterface.class), + ClientRMProtocolPB.class), new Service( YarnConfiguration.YARN_SECURITY_SERVICE_AUTHORIZATION_APPLICATIONMASTER_RESOURCEMANAGER, - AMRMProtocol.AMRMProtocolService.BlockingInterface.class), + AMRMProtocolPB.class), new Service( YarnConfiguration.YARN_SECURITY_SERVICE_AUTHORIZATION_ADMIN, - RMAdminProtocol.RMAdminProtocolService.BlockingInterface.class), + RMAdminProtocolPB.class), new Service( YarnConfiguration.YARN_SECURITY_SERVICE_AUTHORIZATION_CONTAINER_MANAGER, - ContainerManager.ContainerManagerService.BlockingInterface.class), + ContainerManagerPB.class), }; @Override Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java Thu Mar 29 02:02:17 2012 @@ -235,10 +235,11 @@ public class TestAMAuthorization { client.registerApplicationMaster(request); Assert.fail("Should fail with authorization error"); } catch (YarnRemoteException e) { - Assert.assertEquals("Unauthorized request from ApplicationMaster. " - + "Expected ApplicationAttemptID: " - + applicationAttemptId.toString() + " Found: " - + otherAppAttemptId.toString(), e.getMessage()); + Assert.assertTrue(e.getMessage().contains( + "Unauthorized request from ApplicationMaster. " + + "Expected ApplicationAttemptID: " + + applicationAttemptId.toString() + " Found: " + + otherAppAttemptId.toString())); } finally { rm.stop(); } Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java Thu Mar 29 02:02:17 2012 @@ -323,8 +323,10 @@ public class TestApplicationACLs { Assert.fail("App killing by the enemy should fail!!"); } catch (YarnRemoteException e) { LOG.info("Got exception while killing app as the enemy", e); - Assert.assertEquals("User enemy cannot perform operation MODIFY_APP on " - + applicationId, e.getMessage()); + Assert + .assertTrue(e.getMessage().contains( + "User enemy cannot perform operation MODIFY_APP on " + + applicationId)); } rmClient.forceKillApplication(finishAppRequest); Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java?rev=1306689&r1=1306688&r2=1306689&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java Thu Mar 29 02:02:17 2012 @@ -247,10 +247,12 @@ public class TestContainerManagerSecurit Assert.assertEquals( java.lang.reflect.UndeclaredThrowableException.class .getCanonicalName(), e.getClass().getCanonicalName()); - Assert.assertEquals( - "DIGEST-MD5: digest response format violation. " - + "Mismatched response.", e.getCause().getCause() - .getMessage()); + Assert.assertTrue(e + .getCause() + .getMessage() + .contains( + "DIGEST-MD5: digest response format violation. " + + "Mismatched response.")); } return null; } @@ -468,9 +470,10 @@ public class TestContainerManagerSecurit + "access is expected to fail."); } catch (YarnRemoteException e) { LOG.info("Got exception : ", e); - Assert.assertEquals("Unauthorized request to start container. " - + "\nExpected containerId: " + tokenId.getContainerID() - + " Found: " + newContainerId.toString(), e.getMessage()); + Assert.assertTrue(e.getMessage().contains( + "Unauthorized request to start container. " + + "\nExpected containerId: " + tokenId.getContainerID() + + " Found: " + newContainerId.toString())); } }
