tez git commit: TEZ-3189. Pre-warm dags should not be counted in submitted dags count by DAGAppMaster. (Zhiyuan Yang via hitesh)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.7 e49658159 -> 14a89aed7


TEZ-3189. Pre-warm dags should not be counted in submitted dags count by 
DAGAppMaster. (Zhiyuan Yang via hitesh)

(cherry picked from commit c547dcc809cfabc7160d6d570efabdce9c4adbdf)

Conflicts:
        CHANGES.txt


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

Branch: refs/heads/branch-0.7
Commit: 14a89aed785149c859e477192addc55ebf25f375
Parents: e496581
Author: Hitesh Shah <hit...@apache.org>
Authored: Tue Mar 29 10:54:49 2016 -0700
Committer: Hitesh Shah <hit...@apache.org>
Committed: Tue Mar 29 11:09:36 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/14a89aed/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6dee7e6..9e09532 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ INCOMPATIBLE CHANGES
   TEZ-2972. Avoid task rescheduling when a node turns unhealthy
 
 ALL CHANGES:
+  TEZ-3189. Pre-warm dags should not be counted in submitted dags count by 
DAGAppMaster.
   TEZ-2967. Vertex start time should be that of first task start time in UI
   TEZ-3175. Add tez client submit host
   TEZ-3166. Fix a few cases where counters aren't fully updated and sent for 
failed tasks. Only adds tests.

http://git-wip-us.apache.org/repos/asf/tez/blob/14a89aed/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 3a7997b..2b33686 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
@@ -1288,7 +1288,9 @@ public class DAGAppMaster extends AbstractService {
       if (LOG.isDebugEnabled()) {
         LOG.debug("Invoked with additional local resources: " + 
additionalResources);
       }
-      submittedDAGs.incrementAndGet();
+      if 
(dagPlan.getName().startsWith(TezConstants.TEZ_PREWARM_DAG_NAME_PREFIX)) {
+        submittedDAGs.incrementAndGet();
+      }
       startDAG(dagPlan, additionalResources);
       return currentDAG.getID().toString();
     }