Repository: tez Updated Branches: refs/heads/master dd0293f12 -> 92e8927a2
TEZ-2868. Fix setting Caller Context in Tez Examples. (hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/92e8927a Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/92e8927a Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/92e8927a Branch: refs/heads/master Commit: 92e8927a276896d90e261c6d7b4c13b34f5cf296 Parents: dd0293f Author: Hitesh Shah <[email protected]> Authored: Wed Oct 7 14:22:51 2015 -0700 Committer: Hitesh Shah <[email protected]> Committed: Wed Oct 7 14:22:51 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ tez-api/src/main/java/org/apache/tez/dag/api/DAG.java | 2 -- .../src/main/java/org/apache/tez/examples/TezExampleBase.java | 1 + .../apache/tez/mapreduce/examples/TestOrderedWordCount.java | 7 ++++++- 4 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/92e8927a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 58b574c..8cd6400 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ Release 0.8.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2868. Fix setting Caller Context in Tez Examples. TEZ-2860. NPE in DAGClientImpl. TEZ-2855. Fix a potential NPE while routing VertexManager events. TEZ-2758. Remove append API in RecoveryService after TEZ-1909. @@ -198,6 +199,7 @@ Release 0.7.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES + TEZ-2868. Fix setting Caller Context in Tez Examples. TEZ-2860. NPE in DAGClientImpl. TEZ-2855. Fix a potential NPE while routing VertexManager events. TEZ-2758. Remove append API in RecoveryService after TEZ-1909. http://git-wip-us.apache.org/repos/asf/tez/blob/92e8927a/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java ---------------------------------------------------------------------- diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java b/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java index 68b6d52..e4fdc18 100644 --- a/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java +++ b/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java @@ -37,9 +37,7 @@ import org.apache.tez.client.CallerContext; import org.apache.tez.common.JavaOptsChecker; import org.apache.tez.dag.api.Vertex.VertexExecutionContext; import org.apache.tez.dag.api.records.DAGProtos; -import org.apache.tez.dag.api.records.DAGProtos.CallerContextProto; import org.apache.tez.serviceplugins.api.ServicePluginsDescriptor; -import org.apache.tez.serviceplugins.api.TaskSchedulerDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; http://git-wip-us.apache.org/repos/asf/tez/blob/92e8927a/tez-examples/src/main/java/org/apache/tez/examples/TezExampleBase.java ---------------------------------------------------------------------- diff --git a/tez-examples/src/main/java/org/apache/tez/examples/TezExampleBase.java b/tez-examples/src/main/java/org/apache/tez/examples/TezExampleBase.java index c88c833..5922100 100644 --- a/tez-examples/src/main/java/org/apache/tez/examples/TezExampleBase.java +++ b/tez-examples/src/main/java/org/apache/tez/examples/TezExampleBase.java @@ -147,6 +147,7 @@ public abstract class TezExampleBase extends Configured implements Tool { if (appId != null) { callerContext.setCallerIdAndType(appId.toString(), "TezExampleApplication"); } + dag.setCallerContext(callerContext); DAGClient dagClient = tezClientInternal.submitDAG(dag); Set<StatusGetOpts> getOpts = Sets.newHashSet(); http://git-wip-us.apache.org/repos/asf/tez/blob/92e8927a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java index 6966e8d..3188c6e 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java @@ -277,7 +277,6 @@ public class TestOrderedWordCount extends Configured implements Tool { vertices.add(finalReduceVertex); DAG dag = DAG.create("OrderedWordCount" + dagIndex); - dag.setCallerContext(CallerContext.create("Tez", "TestOrderedWordCount Job")); for (int i = 0; i < vertices.size(); ++i) { dag.addVertex(vertices.get(i)); } @@ -447,6 +446,12 @@ public class TestOrderedWordCount extends Configured implements Tool { DAG dag = instance.createDAG(fs, tezConf, localResources, stagingDir, dagIndex, inputPath, outputPath, generateSplitsInClient, useMRSettings, intermediateNumReduceTasks); + String callerType = "TestOrderedWordCount"; + String callerId = tezSession.getAppMasterApplicationId() == null ? + ( "UnknownApp_" + System.currentTimeMillis() + dagIndex ) : + ( tezSession.getAppMasterApplicationId().toString() + "_" + dagIndex); + dag.setCallerContext(CallerContext.create("Tez", callerId, callerType, + "TestOrderedWordCount Job")); boolean doPreWarm = dagIndex == 1 && useTezSession && conf.getBoolean("PRE_WARM_SESSION", true);
