tez git commit: TEZ-3384. Fix TestATSV15HistoryLoggingService::testDAGGroupingGroupingEnabled unit test. (Sushmitha Sreenivasan via hitesh)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.8 c882d829f -> ad954d796


TEZ-3384. Fix TestATSV15HistoryLoggingService::testDAGGroupingGroupingEnabled 
unit test. (Sushmitha Sreenivasan via hitesh)

(cherry picked from commit 3546a411ad1e406ec4c603cffe04956f98315011)

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/ad954d79
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/ad954d79
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/ad954d79

Branch: refs/heads/branch-0.8
Commit: ad954d79625e781a97b474a69ea9f7a78d4391f9
Parents: c882d82
Author: Hitesh Shah <hit...@apache.org>
Authored: Fri Jul 29 08:20:13 2016 -0700
Committer: Hitesh Shah <hit...@apache.org>
Committed: Fri Jul 29 08:21:11 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../history/logging/ats/TestATSV15HistoryLoggingService.java   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/ad954d79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index db8a084..32fca17 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
 
 ALL CHANGES:
 
+  TEZ-3384. Fix 
TestATSV15HistoryLoggingService::testDAGGroupingGroupingEnabled unit test.
   TEZ-3376. Fix groupId generation to account for dagId starting with 1.
   TEZ-3359. Add granular log levels for HistoryLoggingService.
   TEZ-3374. Change TEZ_HISTORY_LOGGING_TIMELINE_NUM_DAGS_PER_GROUP conf key 
name.

http://git-wip-us.apache.org/repos/asf/tez/blob/ad954d79/tez-plugins/tez-yarn-timeline-history-with-fs/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSV15HistoryLoggingService.java
----------------------------------------------------------------------
diff --git 
a/tez-plugins/tez-yarn-timeline-history-with-fs/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSV15HistoryLoggingService.java
 
b/tez-plugins/tez-yarn-timeline-history-with-fs/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSV15HistoryLoggingService.java
index 87a48f6..1869b56 100644
--- 
a/tez-plugins/tez-yarn-timeline-history-with-fs/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSV15HistoryLoggingService.java
+++ 
b/tez-plugins/tez-yarn-timeline-history-with-fs/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSV15HistoryLoggingService.java
@@ -123,16 +123,16 @@ public class TestATSV15HistoryLoggingService {
   public void testDAGGroupingGroupingEnabled() throws Exception {
     int numDagsPerGroup = 100;
     ATSV15HistoryLoggingService service = createService(numDagsPerGroup);
-    TezDAGID dagId1 = TezDAGID.getInstance(appId, 0);
+    TezDAGID dagId1 = TezDAGID.getInstance(appId, 1);
     for (DAGHistoryEvent event : makeHistoryEvents(dagId1, service)) {
       service.handle(event);
     }
-    TezDAGID dagId2 = TezDAGID.getInstance(appId, numDagsPerGroup - 1);
+    TezDAGID dagId2 = TezDAGID.getInstance(appId, numDagsPerGroup );
     for (DAGHistoryEvent event : makeHistoryEvents(dagId2, service)) {
       service.handle(event);
     }
 
-    TezDAGID dagId3 = TezDAGID.getInstance(appId, numDagsPerGroup);
+    TezDAGID dagId3 = TezDAGID.getInstance(appId, numDagsPerGroup + 1);
     for (DAGHistoryEvent event : makeHistoryEvents(dagId3, service)) {
       service.handle(event);
     }