http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskAttemptReport.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskAttemptReport.java b/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskAttemptReport.java deleted file mode 100644 index a5a9e73..0000000 --- a/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskAttemptReport.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * 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.tez.dag.api.records; - -import org.apache.hadoop.yarn.api.records.ContainerId; -import org.apache.tez.common.counters.TezCounters; -import org.apache.tez.dag.records.TezTaskAttemptID; - -public interface TaskAttemptReport { - public abstract TezTaskAttemptID getTaskAttemptId(); - public abstract TaskAttemptState getTaskAttemptState(); - public abstract float getProgress(); - public abstract long getStartTime(); - public abstract long getFinishTime(); - /** @return the shuffle finish time. Applicable only for reduce attempts */ - public abstract long getShuffleFinishTime(); - /** @return the sort/merge finish time. Applicable only for reduce attempts */ - public abstract long getSortFinishTime(); - public abstract TezCounters getCounters(); - public abstract String getDiagnosticInfo(); - public abstract String getStateString(); - public abstract String getNodeManagerHost(); - public abstract int getNodeManagerPort(); - public abstract int getNodeManagerHttpPort(); - public abstract ContainerId getContainerId(); - - public abstract void setTaskAttemptId(TezTaskAttemptID taskAttemptId); - public abstract void setTaskAttemptState(TaskAttemptState taskAttemptState); - public abstract void setProgress(float progress); - public abstract void setStartTime(long startTime); - public abstract void setFinishTime(long finishTime); - public abstract void setCounters(TezCounters counters); - public abstract void setDiagnosticInfo(String diagnosticInfo); - public abstract void setStateString(String stateString); - public abstract void setNodeManagerHost(String nmHost); - public abstract void setNodeManagerPort(int nmPort); - public abstract void setNodeManagerHttpPort(int nmHttpPort); - public abstract void setContainerId(ContainerId containerId); - - /** - * Set the shuffle finish time. Applicable only for reduce attempts - * @param time the time the shuffle finished. - */ - public abstract void setShuffleFinishTime(long time); - /** - * Set the sort/merge finish time. Applicable only for reduce attempts - * @param time the time the shuffle finished. - */ - public abstract void setSortFinishTime(long time); -}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskAttemptState.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskAttemptState.java b/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskAttemptState.java deleted file mode 100644 index 455aa1b..0000000 --- a/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskAttemptState.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * 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.tez.dag.api.records; - -public enum TaskAttemptState { - NEW, - STARTING, - RUNNING, - COMMIT_PENDING, - SUCCEEDED, - FAILED, - KILLED -} http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskReport.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskReport.java b/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskReport.java deleted file mode 100644 index a0834d7..0000000 --- a/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskReport.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 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.tez.dag.api.records; - -import java.util.List; - -import org.apache.tez.common.counters.TezCounters; -import org.apache.tez.dag.records.TezTaskAttemptID; -import org.apache.tez.dag.records.TezTaskID; - -public interface TaskReport { - public abstract TezTaskID getTaskId(); - public abstract TaskState getTaskState(); - public abstract float getProgress(); - public abstract long getStartTime(); - public abstract long getFinishTime(); - public abstract TezCounters getCounters(); - - public abstract List<TezTaskAttemptID> getRunningAttemptsList(); - public abstract TezTaskAttemptID getRunningAttempt(int index); - public abstract int getRunningAttemptsCount(); - - public abstract TezTaskAttemptID getSuccessfulAttempt(); - - public abstract List<String> getDiagnosticsList(); - public abstract String getDiagnostics(int index); - public abstract int getDiagnosticsCount(); - - - public abstract void setTaskId(TezTaskID taskId); - public abstract void setTaskState(TaskState taskState); - public abstract void setProgress(float progress); - public abstract void setStartTime(long startTime); - public abstract void setFinishTime(long finishTime); - public abstract void setCounters(TezCounters counters); - - public abstract void addAllRunningAttempts(List<TezTaskAttemptID> taskAttempts); - public abstract void addRunningAttempt(TezTaskAttemptID taskAttempt); - public abstract void removeRunningAttempt(int index); - public abstract void clearRunningAttempts(); - - public abstract void setSuccessfulAttempt(TezTaskAttemptID taskAttempt); - public abstract void addAllDiagnostics(List<String> diagnostics); - public abstract void addDiagnostics(String diagnostics); - public abstract void removeDiagnostics(int index); - public abstract void clearDiagnostics(); -} http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskState.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskState.java b/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskState.java deleted file mode 100644 index 411a8f4..0000000 --- a/tez-dag/src/main/java/org/apache/tez/dag/api/records/TaskState.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * 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.tez.dag.api.records; - -public enum TaskState { - NEW, SCHEDULED, RUNNING, SUCCEEDED, FAILED, KILLED -} http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/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 a0c2676..804c20c 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 @@ -22,6 +22,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.security.PrivilegedExceptionAction; +import java.util.Collections; import java.util.EnumSet; import java.util.List; import java.util.Map; @@ -63,10 +64,14 @@ import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.service.CompositeService; import org.apache.hadoop.yarn.service.Service; import org.apache.hadoop.yarn.util.ConverterUtils; -import org.apache.tez.dag.api.DAGProtos.DAGPlan; -import org.apache.tez.dag.api.DAGProtos.VertexPlan; +import org.apache.tez.dag.api.records.DAGProtos.DAGPlan; +import org.apache.tez.dag.api.records.DAGProtos.VertexPlan; +import org.apache.tez.dag.api.client.DAGClient; +import org.apache.tez.dag.api.client.DAGStatus; +import org.apache.tez.dag.api.client.VertexStatus; import org.apache.tez.dag.api.DagTypeConverters; import org.apache.tez.dag.api.TezConfiguration; +import org.apache.tez.dag.api.TezException; import org.apache.tez.dag.app.client.ClientService; import org.apache.tez.dag.app.client.impl.TezClientService; import org.apache.tez.dag.app.dag.DAG; @@ -173,6 +178,7 @@ public class DAGAppMaster extends CompositeService { private HistoryEventHandler historyEventHandler; private DAGAppMasterState state; + private DAGMonitorServer monitor; private DAG dag; private Credentials fsTokens = new Credentials(); // Filled during init @@ -223,6 +229,8 @@ public class DAGAppMaster extends CompositeService { appName = jobPlan.getName(); dagId = new TezDAGID(appAttemptID.getApplicationId(), 1); + + monitor = new DAGMonitorServer(); // TODO Committer. // committer = createOutputCommitter(conf); @@ -703,6 +711,35 @@ public class DAGAppMaster extends CompositeService { } LOG.info("On DAG completion. Old state: " + oldState + " new state: " + state); } + + class DAGMonitorServer implements DAGClient { + + @Override + public List<String> getAllDAGs() { + return Collections.singletonList(dag.getID().toString()); + } + + @Override + public DAGStatus getDAGStatus(String dagIdStr) throws TezException { + return getDAG(dagIdStr).getDAGStatus(); + } + + @Override + public VertexStatus getVertexStatus(String dagIdStr, String vertexName) { + return getDAG(dagIdStr).getVertexStatus(vertexName); + } + + DAG getDAG(String dagIdStr) { + TezDAGID dagId = TezDAGID.fromString(dagIdStr); + if(dagId == null) { + throw new TezException("Bad dagId: " + dagIdStr); + } + if(!dagId.equals(dag.getID())) { + throw new TezException("Unknown dagId: " + dagIdStr); + } + return dag; + } + } private class RunningAppContext implements AppContext { http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/MRRExampleHelper.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/MRRExampleHelper.java b/tez-dag/src/main/java/org/apache/tez/dag/app/MRRExampleHelper.java index 0d845b2..92f0e87 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/MRRExampleHelper.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/MRRExampleHelper.java @@ -17,7 +17,7 @@ import org.apache.hadoop.yarn.api.records.LocalResourceType; import org.apache.hadoop.yarn.api.records.LocalResourceVisibility; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.util.BuilderUtils; -import org.apache.tez.dag.api.DAGProtos.DAGPlan; +import org.apache.tez.dag.api.records.DAGProtos.DAGPlan; import org.apache.tez.dag.api.Edge; import org.apache.tez.dag.api.EdgeProperty; import org.apache.tez.dag.api.EdgeProperty.ConnectionPattern; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAG.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAG.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAG.java index f2c3791..913b565 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAG.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAG.java @@ -24,9 +24,10 @@ import java.util.Map; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.yarn.api.records.ApplicationAccessType; import org.apache.tez.common.counters.TezCounters; -import org.apache.tez.dag.api.DAGProtos.DAGPlan; +import org.apache.tez.dag.api.records.DAGProtos.DAGPlan; +import org.apache.tez.dag.api.client.DAGStatusBuilder; +import org.apache.tez.dag.api.client.VertexStatusBuilder; import org.apache.tez.dag.api.TezConfiguration; -import org.apache.tez.dag.api.VertexLocationHint; import org.apache.tez.dag.records.TezDAGID; import org.apache.tez.dag.records.TezVertexID; @@ -61,6 +62,8 @@ public interface DAG { TezConfiguration getConf(); DAGPlan getJobPlan(); + DAGStatusBuilder getDAGStatus(); + VertexStatusBuilder getVertexStatus(String vertexName); /** * @return the ACLs for this job for each type of JobACL given. http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAGReport.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAGReport.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAGReport.java index 1fe18fa..49ab24a 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAGReport.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAGReport.java @@ -20,7 +20,7 @@ package org.apache.tez.dag.app.dag; import java.util.List; import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.tez.dag.api.records.AMInfo; +import org.apache.tez.dag.api.oldrecords.AMInfo; public abstract class DAGReport { public abstract ApplicationId getDAGId(); http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Task.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Task.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Task.java index 6cfc2c2..f3ca831 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Task.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Task.java @@ -21,8 +21,8 @@ package org.apache.tez.dag.app.dag; import java.util.Map; import org.apache.tez.common.counters.TezCounters; -import org.apache.tez.dag.api.records.TaskReport; -import org.apache.tez.dag.api.records.TaskState; +import org.apache.tez.dag.api.oldrecords.TaskReport; +import org.apache.tez.dag.api.oldrecords.TaskState; import org.apache.tez.dag.records.TezTaskAttemptID; import org.apache.tez.dag.records.TezTaskID; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/dag/TaskAttempt.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/TaskAttempt.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/TaskAttempt.java index d4e038a..712f968 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/TaskAttempt.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/TaskAttempt.java @@ -25,8 +25,8 @@ import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.LocalResource; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.tez.common.counters.TezCounters; -import org.apache.tez.dag.api.records.TaskAttemptReport; -import org.apache.tez.dag.api.records.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptReport; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; import org.apache.tez.dag.records.TezTaskAttemptID; /** http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java index ace8a8b..fc86753 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java @@ -28,7 +28,9 @@ import org.apache.tez.common.InputSpec; import org.apache.tez.common.OutputSpec; import org.apache.tez.common.counters.TezCounters; import org.apache.tez.dag.api.EdgeProperty; -import org.apache.tez.dag.api.DAGProtos.VertexPlan; +import org.apache.tez.dag.api.records.DAGProtos.VertexPlan; +import org.apache.tez.dag.api.client.ProgressBuilder; +import org.apache.tez.dag.api.client.VertexStatusBuilder; import org.apache.tez.dag.records.TezTaskID; import org.apache.tez.dag.records.TezVertexID; import org.apache.tez.engine.records.TezDependentTaskCompletionEvent; @@ -59,6 +61,8 @@ public interface Vertex extends Comparable<Vertex> { int getTotalTasks(); int getCompletedTasks(); float getProgress(); + ProgressBuilder getVertexProgress(); + VertexStatusBuilder getVertexStatus(); TezDependentTaskCompletionEvent[] getTaskAttemptCompletionEvents(int fromEventId, int maxEvents); http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventStatusUpdate.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventStatusUpdate.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventStatusUpdate.java index ef23638..2659bba 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventStatusUpdate.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventStatusUpdate.java @@ -21,7 +21,7 @@ package org.apache.tez.dag.app.dag.event; import java.util.List; import org.apache.tez.common.counters.TezCounters; -import org.apache.tez.dag.api.records.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; import org.apache.tez.dag.records.TezTaskAttemptID; public class TaskAttemptEventStatusUpdate extends TaskAttemptEvent { http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/VertexEventTaskCompleted.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/VertexEventTaskCompleted.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/VertexEventTaskCompleted.java index 79512c7..4bf4e24 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/VertexEventTaskCompleted.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/VertexEventTaskCompleted.java @@ -18,7 +18,7 @@ package org.apache.tez.dag.app.dag.event; -import org.apache.tez.dag.api.records.TaskState; +import org.apache.tez.dag.api.oldrecords.TaskState; import org.apache.tez.dag.records.TezTaskID; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java index 02e91b4..66f9c36 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java @@ -52,14 +52,16 @@ import org.apache.hadoop.yarn.state.SingleArcTransition; import org.apache.hadoop.yarn.state.StateMachine; import org.apache.hadoop.yarn.state.StateMachineFactory; import org.apache.tez.common.counters.TezCounters; -import org.apache.tez.dag.api.DAGProtos.EdgePlan; -import org.apache.tez.dag.api.DAGProtos.DAGPlan; -import org.apache.tez.dag.api.DAGProtos.VertexPlan; +import org.apache.tez.dag.api.records.DAGProtos.EdgePlan; +import org.apache.tez.dag.api.records.DAGProtos.DAGPlan; +import org.apache.tez.dag.api.records.DAGProtos.VertexPlan; import org.apache.tez.dag.api.EdgeProperty; import org.apache.tez.dag.api.TezConfiguration; import org.apache.tez.dag.api.VertexLocationHint; -import org.apache.tez.dag.api.client.impl.TezBuilderUtils; -import org.apache.tez.dag.api.impl.DAGStatus; +import org.apache.tez.dag.api.client.DAGStatusBuilder; +import org.apache.tez.dag.api.client.ProgressBuilder; +import org.apache.tez.dag.api.client.VertexStatusBuilder; +import org.apache.tez.dag.api.committer.DAGStatus; import org.apache.tez.dag.api.DagTypeConverters; import org.apache.tez.dag.app.AppContext; import org.apache.tez.dag.app.TaskAttemptListener; @@ -84,6 +86,7 @@ import org.apache.tez.dag.history.events.DAGStartedEvent; import org.apache.tez.dag.records.TezDAGID; import org.apache.tez.dag.records.TezVertexID; import org.apache.tez.dag.utils.DAGApps; +import org.apache.tez.dag.utils.TezBuilderUtils; import org.apache.tez.engine.common.security.JobTokenIdentifier; import org.apache.tez.engine.common.security.JobTokenSecretManager; import org.apache.tez.engine.common.security.TokenCache; @@ -505,7 +508,52 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG, readLock.unlock(); } } + + // monitoring apis + @Override + public DAGStatusBuilder getDAGStatus() { + DAGStatusBuilder status = new DAGStatusBuilder(); + int totalTaskCount = 0; + int totalSucceededTaskCount = 0; + int totalRunningTaskCount = 0; + int totalFailedTaskCount = 0; + int totalKilledTaskCount = 0; + readLock.lock(); + try { + for(Map.Entry<String, Vertex> entry : vertexMap.entrySet()) { + ProgressBuilder progress = entry.getValue().getVertexProgress(); + status.addVertexProgress(entry.getKey(), progress); + totalTaskCount += progress.getTotalTaskCount(); + totalSucceededTaskCount += progress.getSucceededTaskCount(); + totalRunningTaskCount += progress.getRunningTaskCount(); + totalFailedTaskCount += progress.getFailedTaskCount(); + totalKilledTaskCount += progress.getKilledTaskCount(); + } + ProgressBuilder dagProgress = new ProgressBuilder(); + dagProgress.setTotalTaskCount(totalTaskCount); + dagProgress.setSucceededTaskCount(totalSucceededTaskCount); + dagProgress.setRunningTaskCount(totalRunningTaskCount); + dagProgress.setFailedTaskCount(totalFailedTaskCount); + dagProgress.setKilledTaskCount(totalKilledTaskCount); + status.setState(getState()); + status.setDiagnostics(diagnostics); + status.setDAGProgress(dagProgress); + return status; + } finally { + readLock.unlock(); + } + } + @Override + public VertexStatusBuilder getVertexStatus(String vertexName) { + Vertex vertex = vertexMap.get(vertexName); + if(vertex == null) { + return null; + } + return vertex.getVertexStatus(); + } + + protected void startRootVertices() { for (Vertex v : vertices.values()) { if (v.getInputVerticesCount() == 0) { http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/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 264b3ad..92ccffe 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 @@ -56,9 +56,8 @@ import org.apache.tez.common.counters.DAGCounter; import org.apache.tez.common.counters.TezCounters; import org.apache.tez.dag.api.TezConfiguration; import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint; -import org.apache.tez.dag.api.client.impl.TezBuilderUtils; -import org.apache.tez.dag.api.records.TaskAttemptReport; -import org.apache.tez.dag.api.records.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptReport; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; import org.apache.tez.dag.app.AppContext; import org.apache.tez.dag.app.TaskAttemptListener; import org.apache.tez.dag.app.TaskHeartbeatHandler; @@ -93,6 +92,7 @@ import org.apache.tez.dag.history.events.TaskAttemptFinishedEvent; import org.apache.tez.dag.history.events.TaskAttemptStartedEvent; import org.apache.tez.dag.records.TezTaskAttemptID; import org.apache.tez.dag.records.TezTaskID; +import org.apache.tez.dag.utils.TezBuilderUtils; import org.apache.tez.engine.common.security.JobTokenIdentifier; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java index 4d0c4f6..401f1b0 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java @@ -43,9 +43,9 @@ import org.apache.hadoop.yarn.util.Records; import org.apache.tez.common.counters.TezCounters; import org.apache.tez.dag.api.TezConfiguration; import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint; -import org.apache.tez.dag.api.records.TaskAttemptState; -import org.apache.tez.dag.api.records.TaskReport; -import org.apache.tez.dag.api.records.TaskState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskReport; +import org.apache.tez.dag.api.oldrecords.TaskState; import org.apache.tez.dag.app.AppContext; import org.apache.tez.dag.app.TaskAttemptListener; import org.apache.tez.dag.app.TaskHeartbeatHandler; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java index aedb386..20d13cd 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java @@ -55,19 +55,21 @@ import org.apache.hadoop.yarn.state.StateMachineFactory; import org.apache.tez.common.InputSpec; import org.apache.tez.common.OutputSpec; import org.apache.tez.common.counters.TezCounters; -import org.apache.tez.dag.api.DAGProtos.VertexPlan; +import org.apache.tez.dag.api.oldrecords.TaskState; +import org.apache.tez.dag.api.records.DAGProtos.VertexPlan; import org.apache.tez.dag.api.DagTypeConverters; import org.apache.tez.dag.api.TezConfiguration; import org.apache.tez.dag.api.EdgeProperty.ConnectionPattern; import org.apache.tez.dag.api.EdgeProperty; import org.apache.tez.dag.api.VertexLocationHint; import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint; -import org.apache.tez.dag.api.impl.NullVertexOutputCommitter; -import org.apache.tez.dag.api.impl.VertexContext; -import org.apache.tez.dag.api.impl.VertexOutputCommitter; -import org.apache.tez.dag.api.impl.VertexStatus; -import org.apache.tez.dag.api.impl.VertexStatus.State; -import org.apache.tez.dag.api.records.TaskState; +import org.apache.tez.dag.api.client.ProgressBuilder; +import org.apache.tez.dag.api.client.VertexStatusBuilder; +import org.apache.tez.dag.api.committer.NullVertexOutputCommitter; +import org.apache.tez.dag.api.committer.VertexContext; +import org.apache.tez.dag.api.committer.VertexOutputCommitter; +import org.apache.tez.dag.api.committer.VertexStatus; +import org.apache.tez.dag.api.committer.VertexStatus.State; import org.apache.tez.dag.app.AppContext; import org.apache.tez.dag.app.TaskAttemptListener; import org.apache.tez.dag.app.TaskHeartbeatHandler; @@ -519,6 +521,36 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex, this.readLock.unlock(); } } + + @Override + public ProgressBuilder getVertexProgress() { + this.readLock.lock(); + try { + ProgressBuilder progress = new ProgressBuilder(); + progress.setTotalTaskCount(numTasks); + progress.setSucceededTaskCount(succeededTaskCount); + progress.setRunningTaskCount(0); // TODO TEZ-130 + progress.setFailedTaskCount(failedTaskCount); + progress.setKilledTaskCount(killedTaskCount); + return progress; + } finally { + this.readLock.unlock(); + } + } + + @Override + public VertexStatusBuilder getVertexStatus() { + this.readLock.lock(); + try { + VertexStatusBuilder status = new VertexStatusBuilder(); + status.setState(getInternalState()); + status.setDiagnostics(diagnostics); + status.setProgress(getVertexProgress()); + return status; + } finally { + this.readLock.unlock(); + } + } private void computeProgress() { this.readLock.lock(); @@ -599,9 +631,8 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex, writeLock.unlock(); } } - - @Private - public VertexState getInternalState() { + + private VertexState getInternalState() { readLock.lock(); try { return getStateMachine().getCurrentState(); http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTAEnded.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTAEnded.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTAEnded.java index fddd204..b2a90f2 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTAEnded.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTAEnded.java @@ -18,7 +18,7 @@ package org.apache.tez.dag.app.rm; import org.apache.hadoop.yarn.api.records.ContainerId; -import org.apache.tez.dag.api.records.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; import org.apache.tez.dag.app.dag.TaskAttempt; import org.apache.tez.dag.records.TezTaskAttemptID; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/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 31005b6..85ba0b2 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 @@ -38,7 +38,7 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.event.Event; import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.service.AbstractService; -import org.apache.tez.dag.api.records.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; import org.apache.tez.dag.app.AppContext; import org.apache.tez.dag.app.DAGAppMaster; import org.apache.tez.dag.app.DAGAppMasterState; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/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 04c104a..79ccb8e 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 @@ -38,8 +38,7 @@ import org.apache.hadoop.yarn.Clock; import org.apache.hadoop.yarn.YarnException; import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.service.AbstractService; -import org.apache.tez.dag.api.client.impl.TezBuilderUtils; -import org.apache.tez.dag.api.records.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; import org.apache.tez.dag.app.AppContext; import org.apache.tez.dag.app.dag.DAG; import org.apache.tez.dag.app.dag.Task; @@ -50,6 +49,7 @@ import org.apache.tez.dag.app.dag.event.TaskEventType; import org.apache.tez.dag.records.TezTaskAttemptID; import org.apache.tez.dag.records.TezTaskID; import org.apache.tez.dag.records.TezVertexID; +import org.apache.tez.dag.utils.TezBuilderUtils; import org.apache.tez.mapreduce.hadoop.MRJobConfig; // FIXME does not handle multiple vertices http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/LegacyTaskRuntimeEstimator.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/LegacyTaskRuntimeEstimator.java b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/LegacyTaskRuntimeEstimator.java index aa95f37..34bb4e3 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/LegacyTaskRuntimeEstimator.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/LegacyTaskRuntimeEstimator.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.tez.dag.api.records.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; import org.apache.tez.dag.app.dag.DAG; import org.apache.tez.dag.app.dag.Task; import org.apache.tez.dag.app.dag.TaskAttempt; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/StartEndTimesBase.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/StartEndTimesBase.java b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/StartEndTimesBase.java index 191d0b9..ba5bfda 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/StartEndTimesBase.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/StartEndTimesBase.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.apache.hadoop.conf.Configuration; -import org.apache.tez.dag.api.records.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; import org.apache.tez.dag.app.AppContext; import org.apache.tez.dag.app.dag.DAG; import org.apache.tez.dag.app.dag.Task; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java index d1b87b1..5dea9a7 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java @@ -18,7 +18,7 @@ package org.apache.tez.dag.history.events; -import org.apache.tez.dag.api.impl.DAGStatus; +import org.apache.tez.dag.api.committer.DAGStatus; import org.apache.tez.dag.history.HistoryEvent; import org.apache.tez.dag.history.avro.DAGFinished; import org.apache.tez.dag.history.avro.HistoryEventType; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java index 4a2917e..395ba93 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java @@ -18,7 +18,7 @@ package org.apache.tez.dag.history.events; -import org.apache.tez.dag.api.records.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; import org.apache.tez.dag.history.HistoryEvent; import org.apache.tez.dag.history.avro.HistoryEventType; import org.apache.tez.dag.history.avro.TaskAttemptFinished; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java index 165dc20..60f810b 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java @@ -18,7 +18,7 @@ package org.apache.tez.dag.history.events; -import org.apache.tez.dag.api.records.TaskState; +import org.apache.tez.dag.api.oldrecords.TaskState; import org.apache.tez.dag.history.HistoryEvent; import org.apache.tez.dag.history.avro.HistoryEventType; import org.apache.tez.dag.history.avro.TaskFinished; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java index b02be1e..91c209f 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java @@ -18,7 +18,7 @@ package org.apache.tez.dag.history.events; -import org.apache.tez.dag.api.impl.VertexStatus; +import org.apache.tez.dag.api.committer.VertexStatus; import org.apache.tez.dag.history.HistoryEvent; import org.apache.tez.dag.history.avro.HistoryEventType; import org.apache.tez.dag.history.avro.VertexFinished; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/main/java/org/apache/tez/dag/utils/TezBuilderUtils.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/utils/TezBuilderUtils.java b/tez-dag/src/main/java/org/apache/tez/dag/utils/TezBuilderUtils.java new file mode 100644 index 0000000..60ec0a0 --- /dev/null +++ b/tez-dag/src/main/java/org/apache/tez/dag/utils/TezBuilderUtils.java @@ -0,0 +1,54 @@ +/** + * 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.tez.dag.utils; + +import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; +import org.apache.hadoop.yarn.api.records.ContainerId; +import org.apache.tez.dag.api.oldrecords.AMInfo; +import org.apache.tez.dag.app.dag.DAGReport; +import org.apache.tez.dag.records.TezDAGID; +import org.apache.tez.dag.records.TezTaskAttemptID; +import org.apache.tez.dag.records.TezTaskID; +import org.apache.tez.dag.records.TezVertexID; + +public class TezBuilderUtils { + + public static TezVertexID newVertexID(TezDAGID dagId, int vertexId) { + return new TezVertexID(dagId, vertexId); + } + + public static TezTaskAttemptID newTaskAttemptId(TezTaskID taskId, int id) { + return new TezTaskAttemptID(taskId, id); + } + + public static DAGReport newDAGReport() { + return null; + } + + public static AMInfo newAMInfo(ApplicationAttemptId appAttemptID, + long startTime, ContainerId containerID, String nmHost, + int nmPort, int nmHttpPort) { + return null; + } + + public static TezTaskID newTaskId(TezDAGID dagId, int vertexId, int taskId) { + return new TezTaskID(newVertexID(dagId, vertexId), taskId); + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java index 369bced..9601418 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java @@ -56,7 +56,7 @@ import org.apache.hadoop.yarn.util.BuilderUtils; import org.apache.tez.common.TezTaskContext; import org.apache.tez.dag.api.TezConfiguration; import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint; -import org.apache.tez.dag.api.records.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; import org.apache.tez.dag.app.AppContext; import org.apache.tez.dag.app.ContainerHeartbeatHandler; import org.apache.tez.dag.app.TaskAttemptListener; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java index 100f2aa..44e7686 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java @@ -43,8 +43,8 @@ import org.apache.hadoop.yarn.event.InlineDispatcher; import org.apache.hadoop.yarn.util.BuilderUtils; import org.apache.tez.dag.api.TezConfiguration; import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint; -import org.apache.tez.dag.api.records.TaskAttemptState; -import org.apache.tez.dag.api.records.TaskState; +import org.apache.tez.dag.api.oldrecords.TaskAttemptState; +import org.apache.tez.dag.api.oldrecords.TaskState; import org.apache.tez.dag.app.AppContext; import org.apache.tez.dag.app.TaskAttemptListener; import org.apache.tez.dag.app.TaskHeartbeatHandler; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java index a1e450c..fe6ae14 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java @@ -37,23 +37,23 @@ import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.event.DrainDispatcher; import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.util.BuilderUtils; -import org.apache.tez.dag.api.DAGProtos.DAGPlan; -import org.apache.tez.dag.api.DAGProtos.EdgePlan; -import org.apache.tez.dag.api.DAGProtos.PlanEdgeConnectionPattern; -import org.apache.tez.dag.api.DAGProtos.PlanEdgeSourceType; -import org.apache.tez.dag.api.DAGProtos.PlanTaskConfiguration; -import org.apache.tez.dag.api.DAGProtos.PlanTaskLocationHint; -import org.apache.tez.dag.api.DAGProtos.PlanVertexType; -import org.apache.tez.dag.api.DAGProtos.VertexPlan; +import org.apache.tez.dag.api.oldrecords.TaskState; +import org.apache.tez.dag.api.records.DAGProtos.DAGPlan; +import org.apache.tez.dag.api.records.DAGProtos.EdgePlan; +import org.apache.tez.dag.api.records.DAGProtos.PlanEdgeConnectionPattern; +import org.apache.tez.dag.api.records.DAGProtos.PlanEdgeSourceType; +import org.apache.tez.dag.api.records.DAGProtos.PlanTaskConfiguration; +import org.apache.tez.dag.api.records.DAGProtos.PlanTaskLocationHint; +import org.apache.tez.dag.api.records.DAGProtos.PlanVertexType; +import org.apache.tez.dag.api.records.DAGProtos.VertexPlan; import org.apache.tez.dag.api.DagTypeConverters; import org.apache.tez.dag.api.EdgeProperty; import org.apache.tez.dag.api.TezConfiguration; import org.apache.tez.dag.api.VertexLocationHint; -import org.apache.tez.dag.api.impl.NullVertexOutputCommitter; -import org.apache.tez.dag.api.impl.VertexContext; -import org.apache.tez.dag.api.impl.VertexOutputCommitter; -import org.apache.tez.dag.api.impl.VertexStatus.State; -import org.apache.tez.dag.api.records.TaskState; +import org.apache.tez.dag.api.committer.NullVertexOutputCommitter; +import org.apache.tez.dag.api.committer.VertexContext; +import org.apache.tez.dag.api.committer.VertexOutputCommitter; +import org.apache.tez.dag.api.committer.VertexStatus.State; import org.apache.tez.dag.app.AppContext; import org.apache.tez.dag.app.TaskAttemptListener; import org.apache.tez.dag.app.TaskHeartbeatHandler; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de5ee038/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 c0c9923..fcb2ca1 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 @@ -99,7 +99,7 @@ import org.apache.hadoop.yarn.util.Apps; import org.apache.hadoop.yarn.util.BuilderUtils; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.tez.dag.api.DAG; -import org.apache.tez.dag.api.DAGProtos.DAGPlan; +import org.apache.tez.dag.api.records.DAGProtos.DAGPlan; import org.apache.tez.dag.api.Edge; import org.apache.tez.dag.api.EdgeProperty; import org.apache.tez.dag.api.TezConfiguration;
