Skip to content

[SPARK-29160][CORE] Use UTF-8 explicitly for reading/writing event log file #25845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HeartSaVioR wants to merge 4 commits into from
Closed

[SPARK-29160][CORE] Use UTF-8 explicitly for reading/writing event log file #25845

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71bf026
[SPARK-29160][CORE] Use UTF-8 specifically for reading/writing event …
HeartSaVioR Sep 19, 2019
caad54d
Address comment
HeartSaVioR Sep 19, 2019
c39b06f
Add explanation of change to migration note
HeartSaVioR Sep 21, 2019
94558a6
Rephrase SHS to Spark History Server
HeartSaVioR Sep 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ private[spark] class EventLoggingListener(

EventLoggingListener.initEventLog(bstream, testing, loggedEvents)
fileSystem.setPermission(path, LOG_FILE_PERMISSIONS)
writer = Some(new PrintWriter(bstream))
writer = Some(new PrintWriter(new OutputStreamWriter(bstream, StandardCharsets.UTF_8)))
logInfo("Logging events to %s".format(logPath))
} catch {
case e: Exception =>
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/scheduler/ReplayListenerBus.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.spark.scheduler

import java.io.{EOFException, InputStream, IOException}
import java.nio.charset.StandardCharsets

import scala.io.Source

Expand Down Expand Up @@ -54,7 +55,7 @@ private[spark] class ReplayListenerBus extends SparkListenerBus with Logging {
sourceName: String,
maybeTruncated: Boolean = false,
eventsFilter: ReplayEventsFilter = SELECT_ALL_FILTER): Unit = {
val lines = Source.fromInputStream(logData).getLines()
val lines = Source.fromInputStream(logData, StandardCharsets.UTF_8.name()).getLines()
Copy link
Copy Markdown
Member

@MaxGekk MaxGekk Sep 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could avoid converting the charset to string and looking it up again by:

val lines = Source.fromInputStream(logData)(Codec.UTF8).getLines()

Copy link
Copy Markdown
Contributor Author

@HeartSaVioR HeartSaVioR Sep 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice suggestion! Will address.

replay(lines, sourceName, maybeTruncated, eventsFilter)
}

Expand Down
10 changes: 7 additions & 3 deletions core/src/test/scala/org/apache/spark/scheduler/ReplayListenerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package org.apache.spark.scheduler

import java.io._
import java.net.URI
import java.nio.charset.StandardCharsets
import java.util.concurrent.atomic.AtomicInteger

import scala.collection.mutable.ArrayBuffer
Expand Down Expand Up @@ -52,10 +53,11 @@ class ReplayListenerSuite extends SparkFunSuite with BeforeAndAfter with LocalSp
test("Simple replay") {
val logFilePath = getFilePath(testDir, "events.txt")
val fstream = fileSystem.create(logFilePath)
val fwriter = new OutputStreamWriter(fstream, StandardCharsets.UTF_8)
val applicationStart = SparkListenerApplicationStart("Greatest App (N)ever", None,
125L, "Mickey", None)
val applicationEnd = SparkListenerApplicationEnd(1000L)
Utils.tryWithResource(new PrintWriter(fstream)) { writer =>
Utils.tryWithResource(new PrintWriter(fwriter)) { writer =>
// scalastyle:off println
writer.println(compact(render(JsonProtocol.sparkEventToJson(applicationStart))))
writer.println(compact(render(JsonProtocol.sparkEventToJson(applicationEnd))))
Expand Down Expand Up @@ -88,7 +90,8 @@ class ReplayListenerSuite extends SparkFunSuite with BeforeAndAfter with LocalSp
val buffered = new ByteArrayOutputStream
val codec = new LZ4CompressionCodec(new SparkConf())
val compstream = codec.compressedOutputStream(buffered)
Utils.tryWithResource(new PrintWriter(compstream)) { writer =>
val cwriter = new OutputStreamWriter(compstream, StandardCharsets.UTF_8)
Utils.tryWithResource(new PrintWriter(cwriter)) { writer =>

val applicationStart = SparkListenerApplicationStart("AppStarts", None,
125L, "Mickey", None)
Expand Down Expand Up @@ -134,10 +137,11 @@ class ReplayListenerSuite extends SparkFunSuite with BeforeAndAfter with LocalSp
test("Replay incompatible event log") {
val logFilePath = getFilePath(testDir, "incompatible.txt")
val fstream = fileSystem.create(logFilePath)
val fwriter = new OutputStreamWriter(fstream, StandardCharsets.UTF_8)
val applicationStart = SparkListenerApplicationStart("Incompatible App", None,
125L, "UserUsingIncompatibleVersion", None)
val applicationEnd = SparkListenerApplicationEnd(1000L)
Utils.tryWithResource(new PrintWriter(fstream)) { writer =>
Utils.tryWithResource(new PrintWriter(fwriter)) { writer =>
// scalastyle:off println
writer.println(compact(render(JsonProtocol.sparkEventToJson(applicationStart))))
writer.println("""{"Event":"UnrecognizedEventOnlyForTest","Timestamp":1477593059313}""")
Expand Down