Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-1670. aggregated log writer can write more log data then it says is the log length (Mit Desai via jeagles) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580963 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Turner Eagles 2014-03-24 18:17:02 +00:00
parent 5f0f16c0f6
commit c2d8ab6085
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
View File

@ -182,28 +182,36 @@ public void write(DataOutputStream out) throws IOException {
Arrays.sort(logFiles); Arrays.sort(logFiles);
for (File logFile : logFiles) { for (File logFile : logFiles) {
long fileLength = 0; final long fileLength = logFile.length();
// Write the logFile Type // Write the logFile Type
out.writeUTF(logFile.getName()); out.writeUTF(logFile.getName());
// Write the log length as UTF so that it is printable // Write the log length as UTF so that it is printable
out.writeUTF(String.valueOf(fileLength = logFile.length())); out.writeUTF(String.valueOf(fileLength));
// Write the log itself // Write the log itself
FileInputStream in = null; FileInputStream in = null;
try { try {
in = SecureIOUtils.openForRead(logFile, getUser(), null); in = SecureIOUtils.openForRead(logFile, getUser(), null);
byte[] buf = new byte[65535]; byte[] buf = new byte[65535];
long curRead = 0;
int len = 0; int len = 0;
while ( ((len = in.read(buf)) != -1) && (curRead < fileLength) ) { long bytesLeft = fileLength;
out.write(buf, 0, len); while ((len = in.read(buf)) != -1) {
curRead += len; //If buffer contents within fileLength, write
if (len < bytesLeft) {
out.write(buf, 0, len);
bytesLeft-=len;
}
//else only write contents within fileLength, then exit early
else {
out.write(buf, 0, (int)bytesLeft);
break;
}
} }
long newLength = logFile.length(); long newLength = logFile.length();
if(fileLength < newLength) { if(fileLength < newLength) {
LOG.warn("Aggregated Logs Truncated by "+ LOG.warn("Aggregated logs truncated by approximately "+
(newLength-fileLength) +" bytes."); (newLength-fileLength) +" bytes.");
} }
} catch (IOException e) { } catch (IOException e) {