You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2013/09/17 07:44:45 UTC
git commit: TEZ-462. VertexName not set on the Status_Update_Event
(hitesh via bikas)
Updated Branches:
refs/heads/TEZ-398 62689dcc0 -> 4b5dd192d
TEZ-462. VertexName not set on the Status_Update_Event (hitesh via bikas)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/4b5dd192
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/4b5dd192
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/4b5dd192
Branch: refs/heads/TEZ-398
Commit: 4b5dd192d51e96b148741e28147c7d2b0d790f1d
Parents: 62689dc
Author: Bikas Saha <bi...@apache.org>
Authored: Mon Sep 16 22:42:43 2013 -0700
Committer: Bikas Saha <bi...@apache.org>
Committed: Mon Sep 16 22:42:43 2013 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/mapred/YarnTezDagChild.java | 2 +-
.../org/apache/tez/engine/newruntime/RuntimeTask.java | 4 ++++
.../tez/mapreduce/newprocessor/map/MapProcessor.java | 12 ++++--------
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4b5dd192/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java b/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
index 12dbb51..39c3e4c 100644
--- a/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
+++ b/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
@@ -166,7 +166,7 @@ public class YarnTezDagChild {
updateEvent = new TezEvent(new TaskStatusUpdateEvent(
currentTask.getCounters(), currentTask.getProgress()),
new EventMetaData(EventProducerConsumerType.SYSTEM,
- "", "", taskAttemptID));
+ currentTask.getVertexName(), "", taskAttemptID));
}
} finally {
taskLock.readLock().unlock();
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4b5dd192/tez-engine/src/main/java/org/apache/tez/engine/newruntime/RuntimeTask.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/newruntime/RuntimeTask.java b/tez-engine/src/main/java/org/apache/tez/engine/newruntime/RuntimeTask.java
index 92840ae..8b9327e 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/newruntime/RuntimeTask.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/newruntime/RuntimeTask.java
@@ -57,6 +57,10 @@ public abstract class RuntimeTask {
protected State state;
+ public String getVertexName() {
+ return taskSpec.getVertexName();
+ }
+
public void setFatalError(Throwable t, String message) {
hasFatalError.set(true);
this.fatalError = t;
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4b5dd192/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newprocessor/map/MapProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newprocessor/map/MapProcessor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newprocessor/map/MapProcessor.java
index cd9525a..f7d9b16 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newprocessor/map/MapProcessor.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newprocessor/map/MapProcessor.java
@@ -106,10 +106,8 @@ public class MapProcessor extends MRTask implements LogicalIOProcessor {
}
SimpleInputLegacy input = (SimpleInputLegacy)in;
- boolean doingShuffle = true;
KVWriter kvWriter = null;
if (!(out instanceof OnFileSortedOutput)) {
- doingShuffle = false;
kvWriter = ((SimpleOutput)out).getWriter();
} else {
kvWriter = ((OnFileSortedOutput)out).getWriter();
@@ -122,9 +120,9 @@ public class MapProcessor extends MRTask implements LogicalIOProcessor {
}
if (useNewApi) {
- runNewMapper(jobConf, mrReporter, input, kvWriter, doingShuffle);
+ runNewMapper(jobConf, mrReporter, input, kvWriter);
} else {
- runOldMapper(jobConf, mrReporter, input, kvWriter, doingShuffle);
+ runOldMapper(jobConf, mrReporter, input, kvWriter);
}
done();
@@ -134,8 +132,7 @@ public class MapProcessor extends MRTask implements LogicalIOProcessor {
final JobConf job,
final MRTaskReporter reporter,
final SimpleInputLegacy input,
- final KVWriter output,
- final boolean doingShuffle
+ final KVWriter output
) throws IOException, InterruptedException {
// Initialize input in-line since it sets parameters which may be used by the processor.
@@ -158,8 +155,7 @@ public class MapProcessor extends MRTask implements LogicalIOProcessor {
private void runNewMapper(final JobConf job,
MRTaskReporter reporter,
final SimpleInputLegacy in,
- KVWriter out,
- final boolean doingShuffle
+ KVWriter out
) throws IOException, InterruptedException {
// Initialize input in-line since it sets parameters which may be used by the processor.