diff --git hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/local/TestLocalContainerAllocator.java hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/local/TestLocalContainerAllocator.java index 35dfaa7..f4f9360 100644 --- hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/local/TestLocalContainerAllocator.java +++ hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/local/TestLocalContainerAllocator.java @@ -98,7 +98,7 @@ protected AMRMProtocol createSchedulerProxy() { AMRMProtocol scheduler = mock(AMRMProtocol.class); try { when(scheduler.allocate(isA(AllocateRequest.class))) - .thenThrow(RPCUtil.getRemoteException(new IOException("forcefail"))); + .thenThrow(new IOException("forcefail")); } catch (YarnException e) { } catch (IOException e) { } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java index c34e647..2d7e3e1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java @@ -178,16 +178,13 @@ public GetContainerStatusResponse getContainerStatus( @Override public StartContainerResponse startContainer(StartContainerRequest request) - throws YarnException { + throws YarnException, IOException { Token containerToken = request.getContainerToken(); ContainerTokenIdentifier tokenId = null; - try { - tokenId = newContainerTokenIdentifier(containerToken); - tokenId = new ContainerTokenIdentifier(); - } catch (IOException e) { - throw RPCUtil.getRemoteException(e); - } + tokenId = newContainerTokenIdentifier(containerToken); + tokenId = new ContainerTokenIdentifier(); + StartContainerResponse response = recordFactory.newRecordInstance(StartContainerResponse.class); status = recordFactory.newRecordInstance(ContainerStatus.class); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java index 7cdba1e..1385c5f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java @@ -394,21 +394,16 @@ public StartContainerResponse startContainer(StartContainerRequest request) throws YarnException, IOException { if (blockNewContainerRequests.get()) { - throw RPCUtil.getRemoteException(new NMNotYetReadyException( + throw new NMNotYetReadyException( "Rejecting new containers as NodeManager has not" + - " yet connected with ResourceManager")); + " yet connected with ResourceManager"); } ContainerLaunchContext launchContext = request.getContainerLaunchContext(); org.apache.hadoop.yarn.api.records.Token token = request.getContainerToken(); ContainerTokenIdentifier tokenIdentifier = null; - try { - tokenIdentifier = BuilderUtils.newContainerTokenIdentifier(token); - } catch (IOException e) { - throw RPCUtil.getRemoteException(e); - } - + tokenIdentifier = BuilderUtils.newContainerTokenIdentifier(token); UserGroupInformation remoteUgi = getRemoteUgi(); ContainerTokenIdentifier tokenId = getContainerTokenIdentifier(remoteUgi, tokenIdentifier); @@ -424,8 +419,7 @@ public StartContainerResponse startContainer(StartContainerRequest request) String msg = "\nContainer "+ containerIDStr + " rejected as it is allocated by a previous RM"; LOG.error(msg); - throw RPCUtil - .getRemoteException(new InvalidContainerException(msg)); + throw new InvalidContainerException(msg); } LOG.info("Start request for " + containerIDStr + " by user " @@ -438,16 +432,11 @@ public StartContainerResponse startContainer(StartContainerRequest request) DataInputByteBuffer buf = new DataInputByteBuffer(); tokens.rewind(); buf.reset(tokens); - try { - credentials.readTokenStorageStream(buf); - if (LOG.isDebugEnabled()) { - for (Token tk : credentials - .getAllTokens()) { - LOG.debug(tk.getService() + " = " + tk.toString()); - } + credentials.readTokenStorageStream(buf); + if (LOG.isDebugEnabled()) { + for (Token tk : credentials.getAllTokens()) { + LOG.debug(tk.getService() + " = " + tk.toString()); } - } catch (IOException e) { - throw RPCUtil.getRemoteException(e); } } // //////////// End of parsing credentials diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/InvalidContainerException.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/InvalidContainerException.java index d761326..bbed578 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/InvalidContainerException.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/InvalidContainerException.java @@ -18,12 +18,13 @@ package org.apache.hadoop.yarn.server.nodemanager.containermanager; -import org.apache.hadoop.yarn.YarnRuntimeException; +import org.apache.hadoop.yarn.exceptions.YarnException; + /** * This Exception happens when NM is rejecting container requests from RM */ -public class InvalidContainerException extends YarnRuntimeException { +public class InvalidContainerException extends YarnException { private static final long serialVersionUID = 1L; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/NMNotYetReadyException.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/NMNotYetReadyException.java index d63bd2e..df20b63 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/NMNotYetReadyException.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/NMNotYetReadyException.java @@ -18,13 +18,13 @@ package org.apache.hadoop.yarn.server.nodemanager.containermanager; -import org.apache.hadoop.yarn.YarnRuntimeException; +import org.apache.hadoop.yarn.exceptions.YarnException; /** * This exception happens when NM starts from scratch but has not yet connected * with RM. */ -public class NMNotYetReadyException extends YarnRuntimeException { +public class NMNotYetReadyException extends YarnException { private static final long serialVersionUID = 1L; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java index 3765198..51bae7c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java @@ -293,10 +293,8 @@ public void run() { Assert.assertTrue(e.getMessage().contains( "Rejecting new containers as NodeManager has not" + " yet connected with ResourceManager")); - // TO DO: This should be replaced to explicitly check exception - // class name after YARN-142 - Assert.assertTrue(e.getMessage().contains( - NMNotYetReadyException.class.getName())); + Assert.assertEquals(NMNotYetReadyException.class.getName(), e + .getClass().getName()); } catch (IOException e) { assertionFailedInThread.set(true); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java index dbda9fb..5fb8812 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java @@ -528,10 +528,8 @@ public void testContainerLaunchFromPreviousRM() throws IOException, catchException = true; Assert.assertTrue(e.getMessage().contains( "Container " + cId1 + " rejected as it is allocated by a previous RM")); - // TO DO: This should be replaced to explicitly check exception - // class name after YARN-142 - Assert.assertTrue(e.getMessage().contains( - InvalidContainerException.class.getName())); + Assert.assertEquals(InvalidContainerException.class.getName(), e + .getClass().getName()); } // Verify that startContainer fail because of invalid container request diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java index e023b3a..ad40e91 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java @@ -133,7 +133,8 @@ public void stop() { super.stop(); } - private UserGroupInformation checkAcls(String method) throws YarnException { + private UserGroupInformation checkAcls(String method) throws YarnException, + IOException { UserGroupInformation user; try { user = UserGroupInformation.getCurrentUser(); @@ -143,7 +144,7 @@ private UserGroupInformation checkAcls(String method) throws YarnException { RMAuditLogger.logFailure("UNKNOWN", method, adminAcl.toString(), "AdminService", "Couldn't get current user"); - throw RPCUtil.getRemoteException(ioe); + throw ioe; } if (!adminAcl.isUserAllowed(user)) { @@ -154,11 +155,9 @@ private UserGroupInformation checkAcls(String method) throws YarnException { adminAcl.toString(), "AdminService", AuditConstants.UNAUTHORIZED_USER); - throw RPCUtil.getRemoteException( - new AccessControlException("User " + user.getShortUserName() + + throw new AccessControlException("User " + user.getShortUserName() + " doesn't have permission" + - " to call '" + method + "'") - ); + " to call '" + method + "'"); } LOG.info("RM Admin: " + method + " invoked by user " + user.getShortUserName()); @@ -168,7 +167,7 @@ private UserGroupInformation checkAcls(String method) throws YarnException { @Override public RefreshQueuesResponse refreshQueues(RefreshQueuesRequest request) - throws YarnException { + throws YarnException, IOException { UserGroupInformation user = checkAcls("refreshQueues"); try { scheduler.reinitialize(conf, this.rmContext); @@ -180,13 +179,13 @@ public RefreshQueuesResponse refreshQueues(RefreshQueuesRequest request) RMAuditLogger.logFailure(user.getShortUserName(), "refreshQueues", adminAcl.toString(), "AdminService", "Exception refreshing queues"); - throw RPCUtil.getRemoteException(ioe); + throw ioe; } } @Override public RefreshNodesResponse refreshNodes(RefreshNodesRequest request) - throws YarnException { + throws YarnException, IOException { UserGroupInformation user = checkAcls("refreshNodes"); try { this.nodesListManager.refreshNodes(new YarnConfiguration()); @@ -197,14 +196,14 @@ public RefreshNodesResponse refreshNodes(RefreshNodesRequest request) LOG.info("Exception refreshing nodes ", ioe); RMAuditLogger.logFailure(user.getShortUserName(), "refreshNodes", adminAcl.toString(), "AdminService", "Exception refreshing nodes"); - throw RPCUtil.getRemoteException(ioe); + throw ioe; } } @Override public RefreshSuperUserGroupsConfigurationResponse refreshSuperUserGroupsConfiguration( RefreshSuperUserGroupsConfigurationRequest request) - throws YarnException { + throws YarnException, IOException { UserGroupInformation user = checkAcls("refreshSuperUserGroupsConfiguration"); ProxyUsers.refreshSuperUserGroupsConfiguration(new Configuration()); @@ -217,7 +216,7 @@ public RefreshSuperUserGroupsConfigurationResponse refreshSuperUserGroupsConfigu @Override public RefreshUserToGroupsMappingsResponse refreshUserToGroupsMappings( - RefreshUserToGroupsMappingsRequest request) throws YarnException { + RefreshUserToGroupsMappingsRequest request) throws YarnException, IOException { UserGroupInformation user = checkAcls("refreshUserToGroupsMappings"); Groups.getUserToGroupsMappingService().refresh(); @@ -230,7 +229,7 @@ public RefreshUserToGroupsMappingsResponse refreshUserToGroupsMappings( @Override public RefreshAdminAclsResponse refreshAdminAcls( - RefreshAdminAclsRequest request) throws YarnException { + RefreshAdminAclsRequest request) throws YarnException, IOException { UserGroupInformation user = checkAcls("refreshAdminAcls"); Configuration conf = new Configuration(); @@ -245,15 +244,14 @@ public RefreshAdminAclsResponse refreshAdminAcls( @Override public RefreshServiceAclsResponse refreshServiceAcls( - RefreshServiceAclsRequest request) throws YarnException { + RefreshServiceAclsRequest request) throws YarnException, IOException { Configuration conf = new Configuration(); if (!conf.getBoolean( CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION, false)) { - throw RPCUtil.getRemoteException( - new IOException("Service Authorization (" + + throw new IOException("Service Authorization (" + CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION + - ") not enabled.")); + ") not enabled."); } PolicyProvider policyProvider = new RMPolicyProvider(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java index f1459fa..725937d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java @@ -204,7 +204,7 @@ ApplicationId getNewApplicationId() { @Override public GetNewApplicationResponse getNewApplication( - GetNewApplicationRequest request) throws YarnException { + GetNewApplicationRequest request) throws YarnException, IOException { GetNewApplicationResponse response = recordFactory .newRecordInstance(GetNewApplicationResponse.class); response.setApplicationId(getNewApplicationId()); @@ -223,7 +223,7 @@ public GetNewApplicationResponse getNewApplication( */ @Override public GetApplicationReportResponse getApplicationReport( - GetApplicationReportRequest request) throws YarnException { + GetApplicationReportRequest request) throws YarnException, IOException { ApplicationId applicationId = request.getApplicationId(); UserGroupInformation callerUGI; @@ -231,7 +231,7 @@ public GetApplicationReportResponse getApplicationReport( callerUGI = UserGroupInformation.getCurrentUser(); } catch (IOException ie) { LOG.info("Error getting UGI ", ie); - throw RPCUtil.getRemoteException(ie); + throw ie; } RMApp application = this.rmContext.getRMApps().get(applicationId); @@ -255,7 +255,7 @@ public GetApplicationReportResponse getApplicationReport( @Override public SubmitApplicationResponse submitApplication( - SubmitApplicationRequest request) throws YarnException { + SubmitApplicationRequest request) throws YarnException, IOException { ApplicationSubmissionContext submissionContext = request .getApplicationSubmissionContext(); ApplicationId applicationId = submissionContext.getApplicationId(); @@ -274,7 +274,7 @@ public SubmitApplicationResponse submitApplication( RMAuditLogger.logFailure(user, AuditConstants.SUBMIT_APP_REQUEST, ie.getMessage(), "ClientRMService", "Exception in submitting application", applicationId); - throw RPCUtil.getRemoteException(ie); + throw ie; } // Though duplication will checked again when app is put into rmContext, @@ -333,7 +333,7 @@ public SubmitApplicationResponse submitApplication( @SuppressWarnings("unchecked") @Override public KillApplicationResponse forceKillApplication( - KillApplicationRequest request) throws YarnException { + KillApplicationRequest request) throws YarnException, IOException { ApplicationId applicationId = request.getApplicationId(); @@ -345,7 +345,7 @@ public KillApplicationResponse forceKillApplication( RMAuditLogger.logFailure("UNKNOWN", AuditConstants.KILL_APP_REQUEST, "UNKNOWN", "ClientRMService" , "Error getting UGI", applicationId); - throw RPCUtil.getRemoteException(ie); + throw ie; } RMApp application = this.rmContext.getRMApps().get(applicationId); @@ -394,14 +394,14 @@ public GetClusterMetricsResponse getClusterMetrics( @Override public GetAllApplicationsResponse getAllApplications( - GetAllApplicationsRequest request) throws YarnException { + GetAllApplicationsRequest request) throws YarnException, IOException { UserGroupInformation callerUGI; try { callerUGI = UserGroupInformation.getCurrentUser(); } catch (IOException ie) { LOG.info("Error getting UGI ", ie); - throw RPCUtil.getRemoteException(ie); + throw ie; } List reports = new ArrayList(); @@ -433,7 +433,7 @@ public GetClusterNodesResponse getClusterNodes(GetClusterNodesRequest request) @Override public GetQueueInfoResponse getQueueInfo(GetQueueInfoRequest request) - throws YarnException { + throws YarnException, IOException { GetQueueInfoResponse response = recordFactory.newRecordInstance(GetQueueInfoResponse.class); try { @@ -492,7 +492,7 @@ public GetQueueUserAclsInfoResponse getQueueUserAcls( @Override public GetDelegationTokenResponse getDelegationToken( - GetDelegationTokenRequest request) throws YarnException { + GetDelegationTokenRequest request) throws YarnException, IOException { try { // Verify that the connection is kerberos authenticated @@ -524,13 +524,13 @@ public GetDelegationTokenResponse getDelegationToken( )); return response; } catch(IOException io) { - throw RPCUtil.getRemoteException(io); + throw io; } } @Override public RenewDelegationTokenResponse renewDelegationToken( - RenewDelegationTokenRequest request) throws YarnException { + RenewDelegationTokenRequest request) throws YarnException, IOException { try { if (!isAllowedDelegationTokenOp()) { throw new IOException( @@ -549,13 +549,13 @@ public RenewDelegationTokenResponse renewDelegationToken( renewResponse.setNextExpirationTime(nextExpTime); return renewResponse; } catch (IOException e) { - throw RPCUtil.getRemoteException(e); + throw e; } } @Override public CancelDelegationTokenResponse cancelDelegationToken( - CancelDelegationTokenRequest request) throws YarnException { + CancelDelegationTokenRequest request) throws YarnException, IOException { try { if (!isAllowedDelegationTokenOp()) { throw new IOException( @@ -570,7 +570,7 @@ public CancelDelegationTokenResponse cancelDelegationToken( rmDTSecretManager.cancelToken(token, user); return Records.newRecord(CancelDelegationTokenResponse.class); } catch (IOException e) { - throw RPCUtil.getRemoteException(e); + throw e; } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java index 2844924..c084928 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java @@ -239,7 +239,7 @@ protected synchronized void checkAppNumCompletedLimit() { @SuppressWarnings("unchecked") protected void submitApplication( ApplicationSubmissionContext submissionContext, long submitTime, - boolean isRecovered, String user) throws YarnException { + boolean isRecovered, String user) throws YarnException, IOException { ApplicationId applicationId = submissionContext.getApplicationId(); // Validation of the ApplicationSubmissionContext needs to be completed @@ -258,7 +258,7 @@ protected void submitApplication( } catch (InvalidResourceRequestException e) { LOG.warn("RM app submission failed in validating AM resource request" + " for application " + applicationId, e); - throw RPCUtil.getRemoteException(e); + throw e; } } @@ -302,7 +302,7 @@ protected void submitApplication( // Scheduler about the existence of the application this.rmContext.getDispatcher().getEventHandler().handle( new RMAppRejectedEvent(applicationId, ie.getMessage())); - throw RPCUtil.getRemoteException(ie); + throw ie; } // All done, start the RMApp diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java index 71c2fe0..67b5135 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.concurrent.ConcurrentMap; @@ -170,7 +171,7 @@ public void setCompletedAppsMax(int max) { } public void submitApplication( ApplicationSubmissionContext submissionContext, String user) - throws YarnException { + throws YarnException, IOException { super.submitApplication(submissionContext, System.currentTimeMillis(), false, user); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java index d819467..bff7af0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java @@ -147,7 +147,7 @@ protected ClientRMService createClientRMService() { } @Test - public void testGetApplicationReport() throws YarnException { + public void testGetApplicationReport() throws Exception { RMContext rmContext = mock(RMContext.class); when(rmContext.getRMApps()).thenReturn( new ConcurrentHashMap()); @@ -368,7 +368,7 @@ public void handle(Event rawEvent) { public void run() { try { rmService.submitApplication(submitRequest1); - } catch (YarnException e) {} + } catch (Exception e) {} } }; t.start(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java index 7d4bbefb..020fc24 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java @@ -366,7 +366,7 @@ public NodeHeartbeatResponse nodeHeartbeat( } catch (YarnException ioe) { LOG.info("Exception in heartbeat from node " + request.getNodeStatus().getNodeId(), ioe); - throw RPCUtil.getRemoteException(ioe); + throw ioe; } return response; } @@ -382,7 +382,7 @@ public RegisterNodeManagerResponse registerNodeManager( } catch (YarnException ioe) { LOG.info("Exception in node registration from " + request.getNodeId().toString(), ioe); - throw RPCUtil.getRemoteException(ioe); + throw ioe; } return response; }