Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 666D0C6A4 for ; Tue, 4 Jun 2013 05:07:09 +0000 (UTC) Received: (qmail 13952 invoked by uid 500); 4 Jun 2013 05:07:09 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 13927 invoked by uid 500); 4 Jun 2013 05:07:09 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 13920 invoked by uid 99); 4 Jun 2013 05:07:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 05:07:09 +0000 X-ASF-Spam-Status: No, hits=-2000.5 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 04 Jun 2013 05:07:03 +0000 Received: (qmail 13772 invoked by uid 99); 4 Jun 2013 05:06:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 05:06:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3433A5428C; Tue, 4 Jun 2013 05:06:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sseth@apache.org To: commits@tez.incubator.apache.org Date: Tue, 04 Jun 2013 05:06:40 -0000 Message-Id: <84280974d5b74d83bf6463766ab6dc7d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: TEZ-177. Change Tez to use renamed YARN exceptions post YARN-635. (sseth) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/TEZ-1 9feab053f -> a10e607ac TEZ-177. Change Tez to use renamed YARN exceptions post YARN-635. (sseth) Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/114b12a9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/114b12a9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/114b12a9 Branch: refs/heads/TEZ-1 Commit: 114b12a96f1d86fb3c3f01b458dd5b0a69133db6 Parents: 9feab05 Author: Siddharth Seth Authored: Mon Jun 3 22:04:12 2013 -0700 Committer: Siddharth Seth Committed: Mon Jun 3 22:04:12 2013 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/tez/client/TezClient.java | 4 +- .../hadoop/mapred/MRVertexOutputCommitter.java | 4 +- .../java/org/apache/tez/dag/app/DAGAppMaster.java | 6 ++-- .../tez/dag/app/TaskAttemptListenerImpTezDag.java | 4 +- .../tez/dag/app/dag/impl/TaskAttemptImpl.java | 4 +- .../dag/app/launcher/ContainerLauncherImpl.java | 4 +- .../org/apache/tez/dag/app/rm/TaskScheduler.java | 12 ++++---- .../tez/dag/app/rm/TaskSchedulerEventHandler.java | 6 ++-- .../dag/app/rm/container/AMContainerHelpers.java | 4 +- .../org/apache/tez/dag/app/rm/node/AMNodeMap.java | 4 +- .../tez/dag/app/speculate/DefaultSpeculator.java | 10 +++--- .../tez/dag/app/taskclean/TaskCleanerImpl.java | 4 +- .../apache/tez/engine/runtime/RuntimeUtils.java | 4 +- .../apache/tez/mapreduce/MiniMRRTezCluster.java | 4 +- .../tez/mapreduce/ClientServiceDelegate.java | 6 ++-- .../apache/tez/mapreduce/ResourceMgrDelegate.java | 22 +++++++------- .../java/org/apache/tez/mapreduce/YARNRunner.java | 14 +++++----- 17 files changed, 58 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java ---------------------------------------------------------------------- diff --git a/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java b/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java index 73c97b3..ec1dc57 100644 --- a/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java +++ b/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java @@ -26,7 +26,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationReport; import org.apache.hadoop.yarn.client.YarnClient; 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.ConverterUtils; import org.apache.tez.dag.api.TezConfiguration; import org.apache.tez.dag.api.TezException; @@ -52,7 +52,7 @@ public class TezClient { String host = appReport.getHost(); int port = appReport.getRpcPort(); return getDAGClient(host, port); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new TezException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag/src/main/java/org/apache/hadoop/mapred/MRVertexOutputCommitter.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/hadoop/mapred/MRVertexOutputCommitter.java b/tez-dag/src/main/java/org/apache/hadoop/mapred/MRVertexOutputCommitter.java index 171c244..b4949c0 100644 --- a/tez-dag/src/main/java/org/apache/hadoop/mapred/MRVertexOutputCommitter.java +++ b/tez-dag/src/main/java/org/apache/hadoop/mapred/MRVertexOutputCommitter.java @@ -32,7 +32,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.TypeConverter; import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; import org.apache.hadoop.util.ReflectionUtils; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.tez.dag.api.TezException; import org.apache.tez.dag.api.client.VertexStatus; import org.apache.tez.dag.api.committer.VertexContext; @@ -80,7 +80,7 @@ public class MRVertexOutputCommitter extends VertexOutputCommitter { .getOutputFormatClass(), conf); committer = outputFormat.getOutputCommitter(taskContext); } catch (Exception e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } } else { committer = ReflectionUtils.newInstance(conf.getClass( http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java index a4ca97e..96f62a8 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java @@ -48,7 +48,7 @@ import org.apache.hadoop.util.ShutdownHookManager; import org.apache.hadoop.yarn.Clock; import org.apache.hadoop.yarn.ClusterInfo; import org.apache.hadoop.yarn.SystemClock; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler; import org.apache.hadoop.yarn.api.ApplicationConstants; import org.apache.hadoop.yarn.api.ApplicationConstants.Environment; @@ -579,7 +579,7 @@ public class DAGAppMaster extends CompositeService { } } } catch (IOException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } } @@ -827,7 +827,7 @@ public class DAGAppMaster extends CompositeService { @Override public Map getApplicationACLs() { if (getServiceState() != STATE.STARTED) { - throw new YarnException( + throw new YarnRuntimeException( "Cannot get ApplicationACLs before all services have started"); } return taskSchedulerEventHandler.getApplicationAcls(); http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java index 708b33e..14e3144 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java @@ -34,7 +34,7 @@ import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.ipc.Server; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.security.authorize.PolicyProvider; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.service.AbstractService; import org.apache.tez.common.ContainerContext; @@ -129,7 +129,7 @@ public class TaskAttemptListenerImpTezDag extends AbstractService implements server.start(); this.address = NetUtils.getConnectAddress(server); } catch (IOException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java index 94e5161..0b6b23a 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java @@ -36,7 +36,7 @@ import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.yarn.Clock; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.LocalResource; @@ -583,7 +583,7 @@ public class TaskAttemptImpl implements TaskAttempt, case SUCCEEDED: return TaskAttemptState.SUCCEEDED; default: - throw new YarnException("Attempt to convert invalid " + throw new YarnRuntimeException("Attempt to convert invalid " + "stateMachineTaskAttemptState to externalTaskAttemptState: " + smState); } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java index b71af02..5271bae 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java @@ -38,7 +38,7 @@ import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.yarn.Clock; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.api.ContainerManager; import org.apache.hadoop.yarn.api.protocolrecords.StartContainerRequest; import org.apache.hadoop.yarn.api.protocolrecords.StartContainerResponse; @@ -426,7 +426,7 @@ public class ContainerLauncherImpl extends AbstractService implements try { eventQueue.put(event); } catch (InterruptedException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } } } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java index d081d2a..58795d7 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java @@ -30,7 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse; import org.apache.hadoop.yarn.api.records.ApplicationAccessType; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; @@ -44,7 +44,7 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.ResourceRequest; import org.apache.hadoop.yarn.client.AMRMClient.StoredContainerRequest; import org.apache.hadoop.yarn.client.AMRMClientAsync; -import org.apache.hadoop.yarn.exceptions.YarnRemoteException; +import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.service.AbstractService; import org.apache.hadoop.yarn.util.RackResolver; import org.apache.tez.dag.api.TezException; @@ -196,12 +196,12 @@ public class TaskScheduler extends AbstractService response.getMinimumResourceCapability(), response.getMaximumResourceCapability(), response.getApplicationACLs()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { LOG.error("Yarn Exception while registering", e); - throw new YarnException(e); + throw new YarnRuntimeException(e); } catch (IOException e) { LOG.error("IO Exception while registering", e); - throw new YarnException(e); + throw new YarnRuntimeException(e); } } @@ -223,7 +223,7 @@ public class TaskScheduler extends AbstractService // to get our lock. amRmClient.stop(); super.stop(); - } catch (YarnRemoteException e) { + } catch (YarnException e) { LOG.error("Yarn Exception while unregistering ", e); throw new TezException(e); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java index e29db1c..7d55bec 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java @@ -27,7 +27,7 @@ import java.util.concurrent.LinkedBlockingQueue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.api.records.ApplicationAccessType; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; @@ -119,7 +119,7 @@ public class TaskSchedulerEventHandler extends AbstractService handleTASucceeded(event); break; default: - throw new YarnException("Unexecpted TA_ENDED state: " + event.getState()); + throw new YarnRuntimeException("Unexecpted TA_ENDED state: " + event.getState()); } break; case S_CONTAINER_DEALLOCATE: @@ -152,7 +152,7 @@ public class TaskSchedulerEventHandler extends AbstractService try { eventQueue.put(event); } catch (InterruptedException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java index 6156e33..9abff17 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java @@ -35,7 +35,7 @@ import org.apache.hadoop.io.DataOutputBuffer; import org.apache.hadoop.security.Credentials; 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.ApplicationAccessType; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; @@ -129,7 +129,7 @@ public class AMContainerHelpers { ShuffleHandler.serializeServiceData(jobToken)); } catch (IOException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } // Construct the actual Container http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java index a9256aa..efbdb6b 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.event.Event; import org.apache.hadoop.yarn.event.EventHandler; @@ -79,7 +79,7 @@ public class AMNodeMap extends AbstractService implements ", maxTaskFailuresPerNode: " + maxTaskFailuresPerNode); if (blacklistDisablePercent < -1 || blacklistDisablePercent > 100) { - throw new YarnException("Invalid blacklistDisablePercent: " + throw new YarnRuntimeException("Invalid blacklistDisablePercent: " + blacklistDisablePercent + ". Should be an integer between 0 and 100 or -1 to disabled"); } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/DefaultSpeculator.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/DefaultSpeculator.java b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/DefaultSpeculator.java index 79ccb8e..c5bb936 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/DefaultSpeculator.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/DefaultSpeculator.java @@ -35,7 +35,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.Clock; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.service.AbstractService; import org.apache.tez.dag.api.oldrecords.TaskAttemptState; @@ -127,16 +127,16 @@ public class DefaultSpeculator extends AbstractService implements estimator.contextualize(conf, context); } catch (InstantiationException ex) { LOG.error("Can't make a speculation runtime extimator", ex); - throw new YarnException(ex); + throw new YarnRuntimeException(ex); } catch (IllegalAccessException ex) { LOG.error("Can't make a speculation runtime extimator", ex); - throw new YarnException(ex); + throw new YarnRuntimeException(ex); } catch (InvocationTargetException ex) { LOG.error("Can't make a speculation runtime extimator", ex); - throw new YarnException(ex); + throw new YarnRuntimeException(ex); } catch (NoSuchMethodException ex) { LOG.error("Can't make a speculation runtime extimator", ex); - throw new YarnException(ex); + throw new YarnRuntimeException(ex); } return estimator; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-dag/src/main/java/org/apache/tez/dag/app/taskclean/TaskCleanerImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/taskclean/TaskCleanerImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/taskclean/TaskCleanerImpl.java index 4e6f897..1590cda 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/taskclean/TaskCleanerImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/taskclean/TaskCleanerImpl.java @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.service.AbstractService; import org.apache.tez.dag.app.AppContext; @@ -114,7 +114,7 @@ public class TaskCleanerImpl extends AbstractService implements TaskCleaner { try { eventQueue.put(event); } catch (InterruptedException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-engine/src/main/java/org/apache/tez/engine/runtime/RuntimeUtils.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/runtime/RuntimeUtils.java b/tez-engine/src/main/java/org/apache/tez/engine/runtime/RuntimeUtils.java index 1946a62..0dbda40 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/runtime/RuntimeUtils.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/runtime/RuntimeUtils.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.tez.common.InputSpec; import org.apache.tez.common.OutputSpec; import org.apache.tez.common.TezEngineTaskContext; @@ -119,7 +119,7 @@ public class RuntimeUtils { } t = createRuntime(taskContext, processor, inputs, outputs); } catch (ClassNotFoundException e) { - throw new YarnException("Unable to initialize RuntimeTask, context=" + throw new YarnRuntimeException("Unable to initialize RuntimeTask, context=" + taskContext, e); } return t; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-mapreduce-tests/src/test/java/org/apache/tez/mapreduce/MiniMRRTezCluster.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce-tests/src/test/java/org/apache/tez/mapreduce/MiniMRRTezCluster.java b/tez-mapreduce-tests/src/test/java/org/apache/tez/mapreduce/MiniMRRTezCluster.java index 41a1cf3..bbf5e68 100644 --- a/tez-mapreduce-tests/src/test/java/org/apache/tez/mapreduce/MiniMRRTezCluster.java +++ b/tez-mapreduce-tests/src/test/java/org/apache/tez/mapreduce/MiniMRRTezCluster.java @@ -31,7 +31,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.ShuffleHandler; 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 MiniMRRTezCluster extends MiniYARNCluster { 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"); http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/ClientServiceDelegate.java ---------------------------------------------------------------------- diff --git a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/ClientServiceDelegate.java b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/ClientServiceDelegate.java index 1335a44..88fafbf 100644 --- a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/ClientServiceDelegate.java +++ b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/ClientServiceDelegate.java @@ -29,7 +29,7 @@ import org.apache.hadoop.mapreduce.TaskCompletionEvent; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.yarn.api.records.ApplicationReport; 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.tez.client.TezClient; import org.apache.tez.dag.api.TezConfiguration; import org.apache.tez.dag.api.TezRemoteException; @@ -155,7 +155,7 @@ public class ClientServiceDelegate { public LogParams getLogFilePath(JobID oldJobID, TaskAttemptID oldTaskAttemptID) - throws YarnRemoteException, IOException { + throws YarnException, IOException { // FIXME logs for an attempt? throw new UnsupportedOperationException(); } @@ -165,7 +165,7 @@ public class ClientServiceDelegate { TypeConverter.toYarn(oldJobID); try { return rm.getApplicationReport(jobId.getAppId()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/ResourceMgrDelegate.java ---------------------------------------------------------------------- diff --git a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/ResourceMgrDelegate.java b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/ResourceMgrDelegate.java index 2561b56..8563a09 100644 --- a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/ResourceMgrDelegate.java +++ b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/ResourceMgrDelegate.java @@ -41,7 +41,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationId; 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; import org.apache.tez.mapreduce.hadoop.MRJobConfig; @@ -67,7 +67,7 @@ public class ResourceMgrDelegate extends YarnClientImpl { InterruptedException { try { return TypeConverter.fromYarnNodes(super.getNodeReports()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -75,7 +75,7 @@ public class ResourceMgrDelegate extends YarnClientImpl { public JobStatus[] getAllJobs() throws IOException, InterruptedException { try { return TypeConverter.fromYarnApps(super.getApplicationList(), this.conf); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -92,7 +92,7 @@ public class ResourceMgrDelegate extends YarnClientImpl { YarnClusterMetrics metrics; try { metrics = super.getYarnClusterMetrics(); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } ClusterMetrics oldMetrics = new ClusterMetrics(1, 1, 1, 1, 1, 1, @@ -107,7 +107,7 @@ public class ResourceMgrDelegate extends YarnClientImpl { try { return ProtoUtils.convertFromProtoFormat( super.getRMDelegationToken(renewer), rmAddress); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -119,7 +119,7 @@ public class ResourceMgrDelegate extends YarnClientImpl { public JobID getNewJobID() throws IOException, InterruptedException { try { this.application = super.getNewApplication(); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } this.applicationId = this.application.getApplicationId(); @@ -131,7 +131,7 @@ public class ResourceMgrDelegate extends YarnClientImpl { try { return TypeConverter.fromYarn( super.getQueueInfo(queueName), this.conf); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -141,7 +141,7 @@ public class ResourceMgrDelegate extends YarnClientImpl { try { return TypeConverter.fromYarnQueueUserAclsInfo(super .getQueueAclsInfo()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -149,7 +149,7 @@ public class ResourceMgrDelegate extends YarnClientImpl { public QueueInfo[] getQueues() throws IOException, InterruptedException { try { return TypeConverter.fromYarnQueueInfo(super.getAllQueues(), this.conf); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -157,7 +157,7 @@ public class ResourceMgrDelegate extends YarnClientImpl { public QueueInfo[] getRootQueues() throws IOException, InterruptedException { try { return TypeConverter.fromYarnQueueInfo(super.getRootQueueInfos(), this.conf); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -167,7 +167,7 @@ public class ResourceMgrDelegate extends YarnClientImpl { try { return TypeConverter.fromYarnQueueInfo(super.getChildQueueInfos(parent), this.conf); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/114b12a9/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java ---------------------------------------------------------------------- diff --git a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java index 05b5411..592648e 100644 --- a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java +++ b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java @@ -72,7 +72,7 @@ import org.apache.hadoop.mapreduce.v2.util.MRApps; import org.apache.hadoop.security.Credentials; 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; @@ -87,7 +87,7 @@ import org.apache.hadoop.yarn.api.records.Resource; 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.util.Apps; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.util.Records; @@ -888,7 +888,7 @@ public class YARNRunner implements ClientProtocol { try { ts.writeTokenStorageFile(applicationTokensFile, conf); } catch (IOException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } FileSystem fs = FileSystem.get(conf); @@ -924,7 +924,7 @@ public class YARNRunner implements ClientProtocol { || appMasterReport.getYarnApplicationState() == YarnApplicationState.KILLED) { throw new IOException("Failed to run job : " + diagnostics); } - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } @@ -1007,7 +1007,7 @@ public class YARNRunner implements ClientProtocol { if (status.getState() != JobStatus.State.RUNNING) { try { resMgrDelegate.killApplication(TypeConverter.toYarn(arg0).getAppId()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } return; @@ -1035,7 +1035,7 @@ public class YARNRunner implements ClientProtocol { if (status.getState() != JobStatus.State.KILLED) { try { resMgrDelegate.killApplication(TypeConverter.toYarn(arg0).getAppId()); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } } @@ -1070,7 +1070,7 @@ public class YARNRunner implements ClientProtocol { throws IOException { try { return clientCache.getClient(jobID).getLogFilePath(jobID, taskAttemptID); - } catch (YarnRemoteException e) { + } catch (YarnException e) { throw new IOException(e); } }