tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject tez git commit: TEZ-1687. Use logIdentifier of Vertex for logging (zjffdu)
Date Tue, 11 Nov 2014 04:35:43 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.5 ca4980ad4 -> 13ede7e58


TEZ-1687. Use logIdentifier of Vertex for logging (zjffdu)

(cherry picked from commit 103839b6ccbee0de646bfd3eaf25b8f5ec73a942)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/13ede7e5
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/13ede7e5
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/13ede7e5

Branch: refs/heads/branch-0.5
Commit: 13ede7e58396c82516c99c28697e1f886507f6b4
Parents: ca4980a
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Tue Nov 11 12:34:22 2014 +0800
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Tue Nov 11 12:35:21 2014 +0800

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/tez/dag/app/dag/impl/DAGImpl.java    | 28 +++++-----
 .../org/apache/tez/dag/app/dag/impl/Edge.java   | 14 ++---
 .../apache/tez/dag/app/dag/impl/VertexImpl.java | 54 ++++++++++----------
 .../tez/dag/app/dag/impl/VertexManager.java     |  4 +-
 5 files changed, 51 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/13ede7e5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4bcaf25..a96d69a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@ ALL CHANGES:
   TEZ-1749. Increase test timeout for TestLocalMode.testMultipleClientsWithSession
   TEZ-1750. Add a DAGScheduler which schedules tasks only when sources have been scheduled.
   TEZ-1761. TestRecoveryParser::testGetLastInProgressDAG fails in similar manner to TEZ-1686.
+  TEZ-1687. Use logIdentifier of Vertex for logging.
 
 Release 0.5.2: 2014-11-07
 

http://git-wip-us.apache.org/repos/asf/tez/blob/13ede7e5/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 f877eb4..de62752 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
@@ -772,7 +772,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
     for (Vertex v : vertices.values()) {
       if (v.getInputVerticesCount() == 0) {
         if (LOG.isDebugEnabled()) {
-          LOG.debug("Initing root vertex " + v.getName());
+          LOG.debug("Initing root vertex " + v.getLogIdentifier());
         }
         eventHandler.handle(new VertexEvent(v.getVertexId(),
             VertexEventType.V_INIT));
@@ -781,7 +781,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
     for (Vertex v : vertices.values()) {
       if (v.getInputVerticesCount() == 0) {
         if (LOG.isDebugEnabled()) {
-          LOG.debug("Starting root vertex " + v.getName());
+          LOG.debug("Starting root vertex " + v.getLogIdentifier());
         }
         eventHandler.handle(new VertexEvent(v.getVertexId(),
             VertexEventType.V_START));
@@ -851,7 +851,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
           break;
         }
         if (vertex.getOutputCommitters() == null) {
-          LOG.info("No output committers for vertex: " + vertex.getName());
+          LOG.info("No output committers for vertex: " + vertex.getLogIdentifier());
           continue;
         }
         Map<String, OutputCommitter> outputCommitters =
@@ -868,14 +868,14 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
           }
         }
         if (outputCommitters.isEmpty()) {
-          LOG.info("No exclusive output committers for vertex: " + vertex.getName());
+          LOG.info("No exclusive output committers for vertex: " + vertex.getLogIdentifier());
           continue;
         }
         for (Map.Entry<String, OutputCommitter> entry : outputCommitters.entrySet())
{
           LOG.info("Committing output: " + entry.getKey() + " for vertex: "
-              + vertex.getVertexId());
+              + vertex.getLogIdentifier());
           if (vertex.getState() != VertexState.SUCCEEDED) {
-            throw new TezUncheckedException("Vertex: " + vertex.getName() +
+            throw new TezUncheckedException("Vertex: " + vertex.getLogIdentifier() +
                 " not in SUCCEEDED state. State= " + vertex.getState());
           }
           if (!commitOutput(entry.getKey(), entry.getValue())) {
@@ -897,7 +897,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
         Map<String, OutputCommitter> outputCommitters = vertex
             .getOutputCommitters();
         if (outputCommitters == null || outputCommitters.isEmpty()) {
-          LOG.info("No output committers for vertex: " + vertex.getName());
+          LOG.info("No output committers for vertex: " + vertex.getLogIdentifier());
           continue;
         }
         for (Map.Entry<String, OutputCommitter> entry : outputCommitters
@@ -907,7 +907,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
               || vertex.getState() != VertexState.SUCCEEDED // never commit unsuccessful
outputs
               ) {
             LOG.info("Aborting output: " + entry.getKey() + " for vertex: "
-                + vertex.getVertexId());
+                + vertex.getLogIdentifier());
             try {
               getDagUGI().doAs(new PrivilegedExceptionAction<Void>() {
                 @Override
@@ -918,7 +918,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
               });
             } catch (Exception e) {
               LOG.info("Exception in aborting output: " + entry.getKey()
-                  + " for vertex: " + vertex.getVertexId(), e);
+                  + " for vertex: " + vertex.getLogIdentifier(), e);
             }
           }
           // else successful outputs have already been committed
@@ -1422,7 +1422,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
             if (v.getInputVerticesCount() == 0) {
               if (LOG.isDebugEnabled()) {
                 LOG.debug("Sending Running Recovery event to root vertex "
-                    + v.getName());
+                    + v.getLogIdentifier());
               }
               dag.eventHandler.handle(new VertexEventRecoverVertex(v.getVertexId(),
                   VertexState.RUNNING));
@@ -1478,7 +1478,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
             if (v.getInputVerticesCount() == 0) {
               if (LOG.isDebugEnabled()) {
                 LOG.debug("Sending Running Recovery event to root vertex "
-                    + v.getName());
+                    + v.getLogIdentifier());
               }
               dag.eventHandler.handle(new VertexEventRecoverVertex(v.getVertexId(),
                   VertexState.RUNNING));
@@ -1702,7 +1702,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
 
       job.reRunningVertices.remove(vertex.getVertexId());
 
-      LOG.info("Vertex " + vertex.getVertexId() + " completed."
+      LOG.info("Vertex " + vertex.getLogIdentifier() + " completed."
           + ", numCompletedVertices=" + job.numCompletedVertices
           + ", numSuccessfulVertices=" + job.numSuccessfulVertices
           + ", numFailedVertices=" + job.numFailedVertices
@@ -1732,7 +1732,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
       boolean failed = job.vertexReRunning(vertex);
 
 
-      LOG.info("Vertex " + vertex.getVertexId() + " re-running."
+      LOG.info("Vertex " + vertex.getLogIdentifier() + " re-running."
           + ", numCompletedVertices=" + job.numCompletedVertices
           + ", numSuccessfulVertices=" + job.numSuccessfulVertices
           + ", numFailedVertices=" + job.numFailedVertices
@@ -1839,7 +1839,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
         for (VertexGroupInfo groupInfo : groupList) {
           if (groupInfo.committed) {
             LOG.info("Aborting job as committed vertex: "
-                + vertex.getVertexId() + " is re-running");
+                + vertex.getLogIdentifier() + " is re-running");
             enactKill(DAGTerminationCause.COMMIT_FAILURE,
                 VertexTerminationCause.COMMIT_FAILURE);
             return true;

http://git-wip-us.apache.org/repos/asf/tez/blob/13ede7e5/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/Edge.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/Edge.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/Edge.java
index 360a839..05dfc6e 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/Edge.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/Edge.java
@@ -190,7 +190,7 @@ public class Edge {
   public void setSourceVertex(Vertex sourceVertex) {
     if (this.sourceVertex != null && this.sourceVertex != sourceVertex) {
       throw new TezUncheckedException("Source vertex exists: "
-          + sourceVertex.getName());
+          + sourceVertex.getLogIdentifier());
     }
     this.sourceVertex = sourceVertex;
   }
@@ -199,7 +199,7 @@ public class Edge {
     if (this.destinationVertex != null
         && this.destinationVertex != destinationVertex) {
       throw new TezUncheckedException("Destination vertex exists: "
-          + destinationVertex.getName());
+          + destinationVertex.getLogIdentifier());
     }
     this.destinationVertex = destinationVertex;
   }
@@ -277,7 +277,7 @@ public class Edge {
         Task srcTask = sourceVertex.getTask(srcTaskIndex);
         if (srcTask == null) {
           throw new TezUncheckedException("Unexpected null task." +
-              " sourceVertex=" + sourceVertex.getVertexId() +
+              " sourceVertex=" + sourceVertex.getLogIdentifier() +
               " srcIndex = " + srcTaskIndex +
               " destAttemptId=" + destAttemptId +
               " destIndex=" + destTaskIndex + 
@@ -355,9 +355,9 @@ public class Edge {
         Task destTask = destinationVertex.getTask(destTaskIndex);
         if (destTask == null) {
           throw new TezUncheckedException("Unexpected null task." +
-              " sourceVertex=" + sourceVertex.getVertexId() +
+              " sourceVertex=" + sourceVertex.getLogIdentifier() +
               " srcTaskIndex = " + srcTaskIndex +
-              " destVertex=" + destinationVertex.getVertexId() +
+              " destVertex=" + destinationVertex.getLogIdentifier() +
               " destTaskIndex=" + destTaskIndex + 
               " destNumTasks=" + destinationVertex.getTotalTasks() + 
               " edgeManager=" + edgeManager.getClass().getName());
@@ -453,9 +453,9 @@ public class Edge {
 
   private String generateCommonDebugString(int srcTaskIndex, TezEvent tezEvent) {
     return new StringBuilder()
-        .append(" sourceVertex=").append(sourceVertex.getVertexId())
+        .append(" sourceVertex=").append(sourceVertex.getLogIdentifier())
         .append(" srcIndex = ").append(srcTaskIndex)
-        .append(" destAttemptId=").append(destinationVertex.getVertexId())
+        .append(" destAttemptId=").append(destinationVertex.getLogIdentifier())
         .append(" edgeManager=").append(edgeManager.getClass().getName())
         .append(" Event type=").append(tezEvent.getEventType()).toString();
   }

http://git-wip-us.apache.org/repos/asf/tez/blob/13ede7e5/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 593ecca..8130c18 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
@@ -1251,7 +1251,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
           for(Map.Entry<String, EdgeManagerPluginDescriptor> entry :
               sourceEdgeManagers.entrySet()) {
             LOG.info("Recovering edge manager for source:"
-                + entry.getKey() + " destination: " + getVertexId());
+                + entry.getKey() + " destination: " + getLogIdentifier());
             Vertex sourceVertex = appContext.getCurrentDAG().getVertex(entry.getKey());
             Edge edge = sourceVertices.get(sourceVertex);
             try {
@@ -1309,7 +1309,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
         if(sourceEdgeManagers != null) {
           for(Map.Entry<String, EdgeManagerPluginDescriptor> entry : sourceEdgeManagers.entrySet())
{
             LOG.info("Replacing edge manager for source:"
-                + entry.getKey() + " destination: " + getVertexId());
+                + entry.getKey() + " destination: " + getLogIdentifier());
             Vertex sourceVertex = appContext.getCurrentDAG().getVertex(entry.getKey());
             Edge edge = sourceVertices.get(sourceVertex);
             try {
@@ -1341,7 +1341,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
         stateChangeNotifier.stateChanged(vertexId,
             new VertexStateUpdateParallelismUpdated(vertexName, numTasks, oldNumTasks));
         this.createTasks();
-        LOG.info("Vertex " + getVertexId() +
+        LOG.info("Vertex " + getLogIdentifier() +
             " parallelism set to " + parallelism);
         if (canInitVertex()) {
           getEventHandler().handle(new VertexEvent(getVertexId(), VertexEventType.V_READY_TO_INIT));
@@ -1389,7 +1389,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
           Task task = entry.getValue();
           if (task.getState() != TaskState.NEW) {
             String msg = "All tasks must be in initial state when changing parallelism"
-                + " for vertex: " + getVertexId() + " name: " + getName(); 
+                + " for vertex: " + getLogIdentifier();
             LOG.warn(msg);
             throw new TezUncheckedException(msg);
           }
@@ -1411,7 +1411,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
         if(sourceEdgeManagers != null) {
           for(Map.Entry<String, EdgeManagerPluginDescriptor> entry : sourceEdgeManagers.entrySet())
{
             LOG.info("Replacing edge manager for source:"
-                + entry.getKey() + " destination: " + getVertexId());
+                + entry.getKey() + " destination: " + getLogIdentifier());
             Vertex sourceVertex = appContext.getCurrentDAG().getVertex(entry.getKey());
             Edge edge = sourceVertices.get(sourceVertex);
             try {
@@ -2117,7 +2117,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
           .convertVertexManagerPluginDescriptorFromDAGPlan(vertexPlan
               .getVertexManagerPlugin());
       LOG.info("Setting user vertex manager plugin: "
-          + pluginDesc.getClassName() + " on vertex: " + getName());
+          + pluginDesc.getClassName() + " on vertex: " + getLogIdentifier());
       vertexManager = new VertexManager(pluginDesc, this, appContext, stateChangeNotifier);
     } else {
       // Intended order of picking a vertex manager
@@ -2453,14 +2453,14 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
       if (destEdge == null) {
         throw new TezUncheckedException("Bad destination vertex: " +
             sourceMeta.getEdgeVertexName() + " for event vertex: " +
-            getVertexId());
+            getLogIdentifier());
       }
       if (LOG.isDebugEnabled()) {
         LOG.debug("Routing recovered event"
             + ", vertex=" + logIdentifier
             + ", eventType=" + tezEvent.getEventType()
             + ", sourceInfo=" + sourceMeta
-            + ", destinationVertex" + destVertex.getName());
+            + ", destinationVertex=" + destVertex.getLogIdentifier());
       }
       eventHandler.handle(new VertexEventRouteEvent(destVertex
           .getVertexId(), Collections.singletonList(tezEvent), true));
@@ -2495,8 +2495,8 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
       Preconditions.checkState(
           (vertex.sourceVertices == null || vertex.sourceVertices.containsKey(otherVertex)
||
           vertex.targetVertices == null || vertex.targetVertices.containsKey(otherVertex)),
-          "Not connected to vertex " + otherVertex.getName() + " from vertex: " + vertex.logIdentifier);
-      LOG.info("Edge initialized for connection to vertex " + otherVertex.getName() +
+          "Not connected to vertex " + otherVertex.getLogIdentifier() + " from vertex: "
+ vertex.logIdentifier);
+      LOG.info("Edge initialized for connection to vertex " + otherVertex.getLogIdentifier()
+
           " at vertex : " + vertex.logIdentifier);
       vertex.uninitializedEdges.remove(edge);
       if(vertex.getState() == VertexState.INITIALIZING && vertex.canInitVertex())
{
@@ -2910,7 +2910,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
       if (vertex.numTasks == -1) {
         // this block must always return VertexState.INITIALIZING
         LOG.info("Num tasks is -1. Expecting VertexManager/InputInitializers/1-1 split"
-            + " to set #tasks for the vertex " + vertex.getVertexId());
+            + " to set #tasks for the vertex " + vertex.getLogIdentifier());
 
         if (vertex.inputsWithInitializers != null) {
           LOG.info("Vertex will initialize from input initializer. " + vertex.logIdentifier);
@@ -2935,12 +2935,12 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
             LOG.info("Vertex will initialize via custom vertex manager. " + vertex.logIdentifier);
             return VertexState.INITIALIZING;
           }
-          throw new TezUncheckedException(vertex.getVertexId() +
+          throw new TezUncheckedException(vertex.getLogIdentifier() +
           " has -1 tasks but does not have input initializers, " +
           "1-1 uninited sources or custom vertex manager to set it at runtime");
         }
       } else {
-        LOG.info("Creating " + vertex.numTasks + " for vertex: " + vertex.logIdentifier);
+        LOG.info("Creating " + vertex.numTasks + " tasks for vertex: " + vertex.logIdentifier);
         vertex.createTasks();
         // this block may return VertexState.INITIALIZING
         if (vertex.inputsWithInitializers != null) {
@@ -3082,7 +3082,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
             .checkState(
                 (state == VertexState.INITIALIZING
                     || state == VertexState.INITED || state == VertexState.RUNNING),
-                " Unexpected 1-1 split for vertex " + vertex.getVertexId()
+                " Unexpected 1-1 split for vertex " + vertex.getLogIdentifier()
                     + " in state " + vertex.getState() + " . Split in vertex "
                     + originalSplitSource + " sent by vertex "
                     + splitEvent.getSenderVertex() + " numTasks "
@@ -3090,19 +3090,19 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
         if (vertex.originalOneToOneSplitSource.equals(originalSplitSource)) {
           // ignore another split event that may have come from a different
           // path in the DAG. We have already split because of that source
-          LOG.info("Ignoring split of vertex " + vertex.getVertexId() +
+          LOG.info("Ignoring split of vertex " + vertex.getLogIdentifier() +
               " because of split in vertex " + originalSplitSource +
               " sent by vertex " + splitEvent.getSenderVertex() +
               " numTasks " + splitEvent.getNumTasks());
           return state;
         }
         // cannot split from multiple sources
-        throw new TezUncheckedException("Vertex: " + vertex.getVertexId() +
+        throw new TezUncheckedException("Vertex: " + vertex.getLogIdentifier() +
             " asked to split by: " + originalSplitSource +
             " but was already split by:" + vertex.originalOneToOneSplitSource);
       }
 
-      LOG.info("Splitting vertex " + vertex.getVertexId() +
+      LOG.info("Splitting vertex " + vertex.getLogIdentifier() +
           " because of split in vertex " + originalSplitSource +
           " sent by vertex " + splitEvent.getSenderVertex() +
           " numTasks " + splitEvent.getNumTasks());
@@ -3119,7 +3119,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
         return vertex.getState();
       } else {
         Preconditions.checkState(vertex.getState() == VertexState.INITIALIZING,
-            " Unexpected 1-1 split for vertex " + vertex.getVertexId() +
+            " Unexpected 1-1 split for vertex " + vertex.getLogIdentifier() +
                 " in state " + vertex.getState() +
                 " . Split in vertex " + originalSplitSource +
                 " sent by vertex " + splitEvent.getSenderVertex() +
@@ -3144,7 +3144,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
       }
       vertex.numStartedSourceVertices++;
       LOG.info("Source vertex started: " + startEvent.getSourceVertexId() +
-          " for vertex: " + vertex.getVertexId() + " numStartedSources: " +
+          " for vertex: " + vertex.logIdentifier + " numStartedSources: " +
           vertex.numStartedSourceVertices + " numSources: " + vertex.sourceVertices.size());
 
       if (vertex.numStartedSourceVertices < vertex.sourceVertices.size()) {
@@ -3463,7 +3463,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
     public VertexState transition(VertexImpl vertex, VertexEvent event) {
       VertexEventTaskAttemptCompleted completionEvent =
           ((VertexEventSourceTaskAttemptCompleted) event).getCompletionEvent();
-      LOG.info("Source task attempt completed for vertex: " + vertex.getVertexId()
+      LOG.info("Source task attempt completed for vertex: " + vertex.getLogIdentifier()
             + " attempt: " + completionEvent.getTaskAttemptId()
             + " with state: " + completionEvent.getTaskAttemptState()
             + " vertexState: " + vertex.getState());
@@ -3620,7 +3620,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
       if (vertex.outputCommitters == null // no committer
           || vertex.outputCommitters.isEmpty() // no committer
           || !vertex.commitVertexOutputs) { // committer does not commit on vertex success
-        LOG.info(vertex.getVertexId() + " back to running due to rescheduling "
+        LOG.info(vertex.getLogIdentifier() + " back to running due to rescheduling "
             + ((VertexEventTaskReschedule)event).getTaskID());
         (new TaskRescheduledTransition()).transition(vertex, event);
         // inform the DAG that we are re-running
@@ -3629,7 +3629,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
       }
 
       // terminate any running tasks
-      String diagnosticMsg = vertex.getVertexId() + " failed due to post-commit rescheduling
of "
+      String diagnosticMsg = vertex.getLogIdentifier() + " failed due to post-commit rescheduling
of "
           + ((VertexEventTaskReschedule)event).getTaskID();
       LOG.info(diagnosticMsg);
       vertex.tryEnactKill(VertexTerminationCause.OWN_TASK_FAILURE,
@@ -3747,7 +3747,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
             if (destEdge == null) {
               throw new TezUncheckedException("Bad destination vertex: " +
                   sourceMeta.getEdgeVertexName() + " for event vertex: " +
-                  vertex.getVertexId());
+                  vertex.getLogIdentifier());
             }
             vertex.eventHandler.handle(new VertexEventRouteEvent(destVertex
                 .getVertexId(), Collections.singletonList(tezEvent)));
@@ -3762,7 +3762,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
               if (srcEdge == null) {
                 throw new TezUncheckedException("Bad source vertex: " +
                     sourceMeta.getTaskVertexName() + " for destination vertex: " +
-                    vertex.getVertexId());
+                    vertex.getLogIdentifier());
               }
               srcEdge.sendTezEventToDestinationTasks(tezEvent);
             }
@@ -3876,10 +3876,10 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
     @Override
     public void transition(VertexImpl vertex, VertexEvent event) {
       LOG.error("Invalid event " + event.getType() + " on Vertex "
-          + vertex.getVertexId());
+          + vertex.getLogIdentifier());
       vertex.eventHandler.handle(new DAGEventDiagnosticsUpdate(
           vertex.getDAGId(), "Invalid event " + event.getType()
-          + " on Vertex " + vertex.getVertexId()));
+          + " on Vertex " + vertex.getLogIdentifier()));
       vertex.setFinishTime();
       vertex.finished(VertexState.ERROR);
     }
@@ -4118,7 +4118,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
     for (Entry<Vertex, Edge> entry : this.getInputVertices().entrySet()) {
       InputSpec inputSpec = entry.getValue().getDestinationSpec(taskIndex);
       if (LOG.isDebugEnabled()) {
-        LOG.debug("For vertex : " + this.getName()
+        LOG.debug("For vertex : " + this.getLogIdentifier()
             + ", Using InputSpec : " + inputSpec);
       }
       // TODO DAGAM This should be based on the edge type.

http://git-wip-us.apache.org/repos/asf/tez/blob/13ede7e5/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
index dd38c2a..f02b73b 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
@@ -179,7 +179,7 @@ public class VertexManager {
           });
 
       if (LOG.isDebugEnabled()) {
-        LOG.debug("vertex:" + managedVertex.getName() + "; Added " + events.size() + " for
input " +
+        LOG.debug("vertex:" + managedVertex.getLogIdentifier() + "; Added " + events.size()
+ " for input " +
                 "name " + inputName);
       }
       rootInputInitEventQueue.addAll(tezEvents);
@@ -402,7 +402,7 @@ public class VertexManager {
       throw new AMUserCodeException(Source.VertexManager, e);
     }
     if (LOG.isDebugEnabled()) {
-      LOG.debug("vertex:" + managedVertex.getName() + "; after call of VertexManagerPlugin.onRootVertexInitialized"
+      LOG.debug("vertex:" + managedVertex.getLogIdentifier() + "; after call of VertexManagerPlugin.onRootVertexInitialized"
           + " on input:" + inputName + ", current task events size is " + rootInputInitEventQueue.size());
     }
     List<TezEvent> resultEvents = new ArrayList<TezEvent>();


Mime
View raw message