hadoop git commit: YARN-2777. Mark the end of individual log in aggregated log. Contributed by Varun Saxena

[xgong]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 faeb8b9b5 -> b63ff4c36


YARN-2777. Mark the end of individual log in aggregated log. Contributed
by Varun Saxena

(cherry picked from commit 1a4b52869191b7e39c0101d3585efc12d6362c1c)

Conflicts:
        hadoop-yarn-project/CHANGES.txt


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

Branch: refs/heads/branch-2.7
Commit: b63ff4c36d3391aefe1f2fdca28ed4034ea25aca
Parents: faeb8b9
Author: Xuan <xg...@apache.org>
Authored: Fri Mar 20 10:24:13 2015 -0700
Committer: Xuan <xg...@apache.org>
Committed: Fri Mar 20 10:28:24 2015 -0700

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                   | 3 +++
 .../apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java    | 1 +
 .../hadoop/yarn/logaggregation/TestAggregatedLogFormat.java       | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b63ff4c3/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 46d6ec6..e4c0a6d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -335,6 +335,9 @@ Release 2.7.0 - UNRELEASED
     CapacitySchedulerLeafQueueInfo#aMResourceLimit to AMResourceLimit.
     (Rohith via jianhe)
 
+    YARN-2777. Mark the end of individual log in aggregated log.
+    (Varun Saxena via xgong)
+
   OPTIMIZATIONS
 
     YARN-2990. FairScheduler's delay-scheduling always waits for node-local 
and 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b63ff4c3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
index 29122dc..ad2ee50 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
@@ -711,6 +711,7 @@ public class AggregatedLogFormat {
                   pendingRead > buf.length ? buf.length : (int) pendingRead;
         len = valueStream.read(buf, 0, toRead);
       }
+      out.println("End of LogType:" + fileType);
       out.println("");
     }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b63ff4c3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
index 4301bc9..21e1655 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
@@ -257,7 +257,8 @@ public class TestAggregatedLogFormat {
             + (logUploadedTime ? ("\nLog Upload Time:" + Times.format(System
               .currentTimeMillis())).length() : 0)
             + ("\nLogLength:" + numChars).length()
-            + "\nLog Contents:\n".length() + numChars + "\n".length();
+            + "\nLog Contents:\n".length() + numChars + "\n".length()
+            + "End of LogType:stdout\n".length();
     Assert.assertTrue("LogType not matched", s.contains("LogType:stdout"));
     Assert.assertTrue("log file:stderr should not be aggregated.", 
!s.contains("LogType:stderr"));
     Assert.assertTrue("log file:logs should not be aggregated.", 
!s.contains("LogType:logs"));