Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java?rev=1489283&r1=1489282&r2=1489283&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java Tue Jun 4 04:05:50 2013 @@ -65,12 +65,12 @@ import org.apache.hadoop.mapreduce.v2.ut import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ApplicationReport; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.YarnApplicationState; -import org.apache.hadoop.yarn.exceptions.YarnRemoteException; +import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.ipc.YarnRPC; @@ -143,7 +143,7 @@ public class ClientServiceDelegate { ApplicationReport application = null; try { application = rm.getApplicationReport(appId); - } catch (YarnRemoteException e2) { + } catch (YarnException e2) { throw new IOException(e2); } if (application != null) { @@ -212,11 +212,11 @@ public class ClientServiceDelegate { Thread.sleep(2000); } catch (InterruptedException e1) { LOG.warn("getProxy() call interruped", e1); - throw new YarnException(e1); + throw new YarnRuntimeException(e1); } try { application = rm.getApplicationReport(appId); - } catch (YarnRemoteException e1) { + } catch (YarnException e1) { throw new IOException(e1); } if (application == null) { @@ -226,8 +226,8 @@ public class ClientServiceDelegate { } } catch (InterruptedException e) { LOG.warn("getProxy() call interruped", e); - throw new YarnException(e); - } catch (YarnRemoteException e) { + throw new YarnRuntimeException(e); + } catch (YarnException e) { throw new IOException(e); } } @@ -296,9 +296,9 @@ public class ClientServiceDelegate { try { methodOb = MRClientProtocol.class.getMethod(method, argClass); } catch (SecurityException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } catch (NoSuchMethodException e) { - throw new YarnException("Method name mismatch", e); + throw new YarnRuntimeException("Method name mismatch", e); } int maxRetries = this.conf.getInt( MRJobConfig.MR_CLIENT_MAX_RETRIES, @@ -308,7 +308,7 @@ public class ClientServiceDelegate { try { return methodOb.invoke(getProxy(), args); } catch (InvocationTargetException e) { - // Will not throw out YarnRemoteException anymore + // Will not throw out YarnException anymore LOG.debug("Failed to contact AM/History for job " + jobId + " retrying..", e.getTargetException()); // Force reconnection by setting the proxy to null.
Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java?rev=1489283&r1=1489282&r2=1489283&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java Tue Jun 4 04:05:50 2013 @@ -43,7 +43,7 @@ import org.apache.hadoop.yarn.api.record import org.apache.hadoop.yarn.api.records.YarnClusterMetrics; import org.apache.hadoop.yarn.client.YarnClientImpl; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.exceptions.YarnRemoteException; +import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.util.ProtoUtils; public class ResourceMgrDelegate extends YarnClientImpl { @@ -68,7 +68,7 @@ public class ResourceMgrDelegate extends InterruptedException { try { return TypeConverter.fromYarnNodes(super.getNodeReports()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -76,7 +76,7 @@ public class ResourceMgrDelegate extends public JobStatus[] getAllJobs() throws IOException, InterruptedException { try { return TypeConverter.fromYarnApps(super.getApplicationList(), this.conf); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -98,7 +98,7 @@ public class ResourceMgrDelegate extends metrics.getNumNodeManagers() * 2, 1, metrics.getNumNodeManagers(), 0, 0); return oldMetrics; - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -113,7 +113,7 @@ public class ResourceMgrDelegate extends try { return ProtoUtils.convertFromProtoFormat( super.getRMDelegationToken(renewer), rmAddress); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -127,7 +127,7 @@ public class ResourceMgrDelegate extends this.application = super.getNewApplication(); this.applicationId = this.application.getApplicationId(); return TypeConverter.fromYarn(applicationId); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -139,7 +139,7 @@ public class ResourceMgrDelegate extends super.getQueueInfo(queueName); return (queueInfo == null) ? null : TypeConverter.fromYarn(queueInfo, conf); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -149,7 +149,7 @@ public class ResourceMgrDelegate extends try { return TypeConverter.fromYarnQueueUserAclsInfo(super .getQueueAclsInfo()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -157,7 +157,7 @@ public class ResourceMgrDelegate extends public QueueInfo[] getQueues() throws IOException, InterruptedException { try { return TypeConverter.fromYarnQueueInfo(super.getAllQueues(), this.conf); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -166,7 +166,7 @@ public class ResourceMgrDelegate extends try { return TypeConverter.fromYarnQueueInfo(super.getRootQueueInfos(), this.conf); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -176,7 +176,7 @@ public class ResourceMgrDelegate extends try { return TypeConverter.fromYarnQueueInfo(super.getChildQueueInfos(parent), this.conf); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java?rev=1489283&r1=1489282&r2=1489283&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java Tue Jun 4 04:05:50 2013 @@ -64,7 +64,7 @@ import org.apache.hadoop.security.Securi import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.authorize.AccessControlList; import org.apache.hadoop.security.token.Token; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.api.ApplicationConstants; import org.apache.hadoop.yarn.api.ApplicationConstants.Environment; import org.apache.hadoop.yarn.api.records.ApplicationAccessType; @@ -79,7 +79,7 @@ import org.apache.hadoop.yarn.api.record import org.apache.hadoop.yarn.api.records.URL; import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.exceptions.YarnRemoteException; +import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.security.client.RMTokenSelector; @@ -287,7 +287,7 @@ public class YARNRunner implements Clien try { ts.writeTokenStorageFile(applicationTokensFile, conf); } catch (IOException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } // Construct necessary information to start the MR AM @@ -311,7 +311,7 @@ public class YARNRunner implements Clien diagnostics); } return clientCache.getClient(jobId).getJobStatus(jobId); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -561,7 +561,7 @@ public class YARNRunner implements Clien if (status.getState() != JobStatus.State.RUNNING) { try { resMgrDelegate.killApplication(TypeConverter.toYarn(arg0).getAppId()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } return; @@ -589,7 +589,7 @@ public class YARNRunner implements Clien if (status.getState() != JobStatus.State.KILLED) { try { resMgrDelegate.killApplication(TypeConverter.toYarn(arg0).getAppId()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java?rev=1489283&r1=1489282&r2=1489283&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java Tue Jun 4 04:05:50 2013 @@ -68,7 +68,7 @@ import org.apache.hadoop.mapreduce.v2.ap import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig; import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.net.NetUtils; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest; import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenResponse; @@ -404,7 +404,7 @@ public class TestClientRedirect { address.getAddress(); hostNameResolved = InetAddress.getLocalHost(); } catch (UnknownHostException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } server = Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientServiceDelegate.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientServiceDelegate.java?rev=1489283&r1=1489282&r2=1489283&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientServiceDelegate.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientServiceDelegate.java Tue Jun 4 04:05:50 2013 @@ -56,7 +56,7 @@ import org.apache.hadoop.yarn.api.record import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.exceptions.YarnRemoteException; +import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.util.Records; import org.junit.Test; import org.junit.runner.RunWith; @@ -215,7 +215,7 @@ public class TestClientServiceDelegate { getRunningApplicationReport(null, 0)).thenReturn( getRunningApplicationReport(null, 0)).thenReturn( getRunningApplicationReport("am2", 90)); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } @@ -285,7 +285,7 @@ public class TestClientServiceDelegate { getRunningApplicationReport("am1", 78)).thenReturn( getRunningApplicationReport("am1", 78)).thenReturn( getFinishedApplicationReport()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } @@ -366,7 +366,7 @@ public class TestClientServiceDelegate { verify(rmDelegate, times(3)).getApplicationReport( any(ApplicationId.class)); Assert.assertNotNull(jobStatus); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -396,7 +396,7 @@ public class TestClientServiceDelegate { } verify(rmDelegate, times(noOfRetries)).getApplicationReport( any(ApplicationId.class)); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -447,7 +447,7 @@ public class TestClientServiceDelegate { ResourceMgrDelegate rm = mock(ResourceMgrDelegate.class); try { when(rm.getApplicationReport(jobId.getAppId())).thenReturn(null); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } return rm; Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java?rev=1489283&r1=1489282&r2=1489283&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java Tue Jun 4 04:05:50 2013 @@ -45,7 +45,7 @@ import org.apache.hadoop.mapred.lib.Iden import org.apache.hadoop.mapred.lib.IdentityReducer; import org.apache.hadoop.mapreduce.Cluster.JobTrackerStatus; import org.apache.hadoop.mapreduce.Job; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.junit.Test; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; @@ -181,12 +181,12 @@ public class TestNetworkedJob { try { client.getSetupTaskReports(jobId); - } catch (YarnException e) { + } catch (YarnRuntimeException e) { assertEquals(e.getMessage(), "Unrecognized task type: JOB_SETUP"); } try { client.getCleanupTaskReports(jobId); - } catch (YarnException e) { + } catch (YarnRuntimeException e) { assertEquals(e.getMessage(), "Unrecognized task type: JOB_CLEANUP"); } assertEquals(client.getReduceTaskReports(jobId).length, 0); Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestResourceMgrDelegate.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestResourceMgrDelegate.java?rev=1489283&r1=1489282&r2=1489283&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestResourceMgrDelegate.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestResourceMgrDelegate.java Tue Jun 4 04:05:50 2013 @@ -38,7 +38,7 @@ import org.apache.hadoop.yarn.api.record import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.exceptions.YarnRemoteException; +import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.util.Records; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -60,7 +60,7 @@ public class TestResourceMgrDelegate { try { Mockito.when(applicationsManager.getQueueInfo(Mockito.any( GetQueueInfoRequest.class))).thenReturn(response); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } @@ -78,7 +78,7 @@ public class TestResourceMgrDelegate { try { Mockito.verify(applicationsManager).getQueueInfo( argument.capture()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java?rev=1489283&r1=1489282&r2=1489283&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java Tue Jun 4 04:05:50 2013 @@ -35,7 +35,7 @@ import org.apache.hadoop.mapreduce.v2.hs import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig; import org.apache.hadoop.mapreduce.v2.jobhistory.JobHistoryUtils; import org.apache.hadoop.util.JarFinder; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.MiniYARNCluster; import org.apache.hadoop.yarn.server.nodemanager.ContainerExecutor; @@ -100,7 +100,7 @@ public class MiniMRYarnCluster extends M Path doneDirPath = fc.makeQualified(new Path(doneDir)); fc.mkdir(doneDirPath, null, true); } catch (IOException e) { - throw new YarnException("Could not create staging directory. ", e); + throw new YarnRuntimeException("Could not create staging directory. ", e); } conf.set(MRConfig.MASTER_ADDRESS, "test"); // The default is local because of // which shuffle doesn't happen @@ -158,7 +158,7 @@ public class MiniMRYarnCluster extends M } super.start(); } catch (Throwable t) { - throw new YarnException(t); + throw new YarnRuntimeException(t); } //need to do this because historyServer.init creates a new Configuration getConfig().set(JHAdminConfig.MR_HISTORY_ADDRESS,
