Author: jlowe
Date: Tue Jan 21 19:23:34 2014
New Revision: 1560148
URL: http://svn.apache.org/r1560148
Log:
MAPREDUCE-5693. Restore MRv1 behavior for log flush. Contributed by Gera
Shegalov
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java?rev=1560148&r1=1560147&r2=1560148&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ContainerLogAppender.java
Tue Jan 21 19:23:34 2014
@@ -19,6 +19,7 @@
package org.apache.hadoop.yarn;
import java.io.File;
+import java.io.Flushable;
import java.util.LinkedList;
import java.util.Queue;
@@ -33,7 +34,9 @@ import org.apache.log4j.spi.LoggingEvent
*/
@Public
@Unstable
-public class ContainerLogAppender extends FileAppender {
+public class ContainerLogAppender extends FileAppender
+ implements Flushable
+{
private String containerLogDir;
//so that log4j can configure it from the configuration(log4j.properties).
private int maxEvents;
@@ -65,6 +68,7 @@ public class ContainerLogAppender extend
}
}
+ @Override
public void flush() {
if (qw != null) {
qw.flush();