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

by Varun Saxena

(cherry picked from commit 1a4b528691)
This commit is contained in:
Xuan 2015-03-20 10:24:13 -07:00
parent 0a41b1bdca
commit 7990e1d80d
3 changed files with 6 additions and 1 deletions

View File

@ -366,6 +366,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

View File

@ -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("");
}

View File

@ -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"));