From 6657e00de36b59011d3fe78e8613fb64e54c957a Mon Sep 17 00:00:00 2001
From: liuxian <liu.xian3@zte.com.cn>
Date: Tue, 4 Jul 2017 09:16:40 +0800
Subject: [PATCH] [SPARK-21283][CORE] FileOutputStream should be created as
append mode
## What changes were proposed in this pull request?
`FileAppender` is used to write `stderr` and `stdout` files in `ExecutorRunner`, But before writing `ErrorStream` into the the `stderr` file, the header information has been written into ,if FileOutputStream is not created as append mode, the header information will be lost
## How was this patch tested?
unit test case
Author: liuxian <liu.xian3@zte.com.cn>
Closes #18507 from 10110346/wip-lx-0703.
---
.../scala/org/apache/spark/util/logging/FileAppender.scala | 2 +-
.../test/scala/org/apache/spark/util/FileAppenderSuite.scala | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/core/src/main/scala/org/apache/spark/util/logging/FileAppender.scala b/core/src/main/scala/org/apache/spark/util/logging/FileAppender.scala
index fdb1495899..8a0cc709bc 100644
--- a/core/src/main/scala/org/apache/spark/util/logging/FileAppender.scala
+++ b/core/src/main/scala/org/apache/spark/util/logging/FileAppender.scala
@@ -94,7 +94,7 @@ private[spark] class FileAppender(inputStream: InputStream, file: File, bufferSi
/** Open the file output stream */
protected def openFile() {
- outputStream = new FileOutputStream(file, false)
+ outputStream = new FileOutputStream(file, true)
logDebug(s"Opened file $file")
}
diff --git a/core/src/test/scala/org/apache/spark/util/FileAppenderSuite.scala b/core/src/test/scala/org/apache/spark/util/FileAppenderSuite.scala
index 7e2da8e141..cd0ed5b036 100644
--- a/core/src/test/scala/org/apache/spark/util/FileAppenderSuite.scala
+++ b/core/src/test/scala/org/apache/spark/util/FileAppenderSuite.scala
@@ -52,10 +52,13 @@ class FileAppenderSuite extends SparkFunSuite with BeforeAndAfter with Logging {
test("basic file appender") {
val testString = (1 to 1000).mkString(", ")
val inputStream = new ByteArrayInputStream(testString.getBytes(StandardCharsets.UTF_8))
+ // The `header` should not be covered
+ val header = "Add header"
+ Files.write(header, testFile, StandardCharsets.UTF_8)
val appender = new FileAppender(inputStream, testFile)
inputStream.close()
appender.awaitTermination()
- assert(Files.toString(testFile, StandardCharsets.UTF_8) === testString)
+ assert(Files.toString(testFile, StandardCharsets.UTF_8) === header + testString)
}
test("rolling file appender - time-based rolling") {
--
GitLab