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

by Varun Saxena
apache · Mar 20, 2015 · 1a4b528 · 1a4b528
1 parent 1561231
commit 1a4b528
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
@@ -411,6 +411,9 @@ Release 2.7.0 - UNRELEASED
     YARN-2854. Updated the documentation of the timeline service and the generic
     history service. (Naganarasimha G R via zjshen)
 
+    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 

diff --git a/...-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java b/...-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
@@ -711,6 +711,7 @@ private static void readContainerLogs(DataInputStream valueStream,
                   pendingRead > buf.length ? buf.length : (int) pendingRead;
         len = valueStream.read(buf, 0, toRead);
       }
+      out.println("End of LogType:" + fileType);
       out.println("");
     }
 

diff --git a/...n-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java b/...n-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
@@ -257,7 +257,8 @@ private void testReadAcontainerLog(boolean logUploadedTime) throws Exception {
             + (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"));