tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject tez git commit: TEZ-3189. Pre-warm dags should not be counted in submitted dags count by DAGAppMaster. (Zhiyuan Yang via hitesh)
Date Tue, 29 Mar 2016 18:09:54 GMT
Repository: tez
Updated Branches:
  refs/heads/master 182c9970a -> c547dcc80


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


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

Branch: refs/heads/master
Commit: c547dcc809cfabc7160d6d570efabdce9c4adbdf
Parents: 182c997
Author: Hitesh Shah <hitesh@apache.org>
Authored: Tue Mar 29 10:54:49 2016 -0700
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Tue Mar 29 10:54:49 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/tez/blob/c547dcc8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4b1e91c..f9d0166 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
   TEZ-3029. Add an onError method to service plugin contexts.
 
 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.
@@ -408,6 +409,7 @@ INCOMPATIBLE CHANGES
   TEZ-2949. Allow duplicate dag names within session for Tez.
 
 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.

http://git-wip-us.apache.org/repos/asf/tez/blob/c547dcc8/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 eb9660c..484ae77 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
@@ -1375,7 +1375,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();
     }


Mime
View raw message