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

YARN-7124. LogAggregationTFileController deletes/renames while file is open. Contributed by Jason Lowe. 

(cherry picked from commit 1fcbe7cf5f)
This commit is contained in:
Junping Du 2017-10-16 13:57:03 -07:00
parent 0bddcf10ef
commit 3d2ef54450
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/tfile/LogAggregationTFileController.java
View File

@ -96,9 +96,11 @@ public class LogAggregationTFileController
@Override @Override
public void closeWriter() { public void closeWriter() {
if (this.writer != null) {
this.writer.close(); this.writer.close();
this.writer = null; this.writer = null;
} }
}
@Override @Override
public void write(LogKey logKey, LogValue logValue) throws IOException { public void write(LogKey logKey, LogValue logValue) throws IOException {
@ -117,6 +119,9 @@ public class LogAggregationTFileController
record.increcleanupOldLogTimes(); record.increcleanupOldLogTimes();
} }
// close the writer before the file is renamed or deleted
closeWriter();
final Path renamedPath = record.getRollingMonitorInterval() <= 0 final Path renamedPath = record.getRollingMonitorInterval() <= 0
? record.getRemoteNodeLogFileForApp() : new Path( ? record.getRemoteNodeLogFileForApp() : new Path(
record.getRemoteNodeLogFileForApp().getParent(), record.getRemoteNodeLogFileForApp().getParent(),