tez git commit: TEZ-2868. Fix setting Caller Context in Tez Examples. (hitesh)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.7 bd4912212 -> acbd25002


TEZ-2868. Fix setting Caller Context in Tez Examples. (hitesh)

(cherry picked from commit 92e8927a276896d90e261c6d7b4c13b34f5cf296)

Conflicts:
        CHANGES.txt
        tez-api/src/main/java/org/apache/tez/dag/api/DAG.java


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

Branch: refs/heads/branch-0.7
Commit: acbd2500243595c09582240ec237f60329b2cf9a
Parents: bd49122
Author: Hitesh Shah <hit...@apache.org>
Authored: Wed Oct 7 14:22:51 2015 -0700
Committer: Hitesh Shah <hit...@apache.org>
Committed: Wed Oct 7 14:24:27 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                   | 1 +
 tez-api/src/main/java/org/apache/tez/dag/api/DAG.java         | 1 +
 .../src/main/java/org/apache/tez/examples/TezExampleBase.java | 1 +
 .../apache/tez/mapreduce/examples/TestOrderedWordCount.java   | 7 ++++++-
 4 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/acbd2500/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 362e5d7..c732230 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,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/acbd2500/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 bdde600..0b205bf 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
@@ -34,6 +34,7 @@ import org.apache.commons.collections4.BidiMap;
 import org.apache.commons.collections4.bidimap.DualLinkedHashBidiMap;
 import org.apache.tez.client.CallerContext;
 import org.apache.tez.common.JavaOptsChecker;
+
 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/acbd2500/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 0735c4e..1fa4274 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
@@ -133,6 +133,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/acbd2500/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);