Skip to content

[SPARK-37853][CORE] Clean up deprecation compilation warning related to log4j2 #35153

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
LuciferYang wants to merge 5 commits into from
Closed

[SPARK-37853][CORE] Clean up deprecation compilation warning related to log4j2 #35153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8eeae41
fix compilation warning
LuciferYang Jan 10, 2022
1c85629
add comments
LuciferYang Jan 10, 2022
df0de64
remove unnecessary change
LuciferYang Jan 10, 2022
cb744a9
remove unnecessary change
LuciferYang Jan 10, 2022
2043bf6
reorder import
LuciferYang Jan 10, 2022
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
19 changes: 15 additions & 4 deletions core/src/main/scala/org/apache/spark/util/logging/DriverLogger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,23 @@ private[spark] class DriverLogger(conf: SparkConf) extends Logging {
PatternLayout.newBuilder().withPattern(DEFAULT_LAYOUT).build()
}
val config = logger.getContext.getConfiguration()
val fa = Log4jFileAppender.createAppender(localLogFile, "false", "false",
DriverLogger.APPENDER_NAME, "true", "false", "false", "4000", layout, null,
"false", null, config);
def log4jFileAppender() = {
Copy link
Copy Markdown
Member

@dongjoon-hyun dongjoon-hyun Jan 10, 2022

Choose a reason for hiding this comment

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

This is not a [TESTS], @LuciferYang .

Copy link
Copy Markdown
Contributor Author

@LuciferYang LuciferYang Jan 11, 2022

Choose a reason for hiding this comment

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

Thanks for your correction

// SPARK-37853: We can't use the chained API invocation mode because
// `AbstractFilterable.Builder.asBuilder()` method will return `Any` in Scala.
val builder: Log4jFileAppender.Builder[_] = Log4jFileAppender.newBuilder()
builder.withAppend(false)
builder.withBufferedIo(false)
builder.setConfiguration(config)
builder.withFileName(localLogFile)
builder.setIgnoreExceptions(false)
builder.setLayout(layout)
builder.setName(DriverLogger.APPENDER_NAME)
builder.build()
}
val fa = log4jFileAppender()
logger.addAppender(fa)
fa.start()
logInfo(s"Added a local log appender at: ${localLogFile}")
logInfo(s"Added a local log appender at: $localLogFile")
}

def startSync(hadoopConf: Configuration): Unit = {
Expand Down
6 changes: 3 additions & 3 deletions core/src/test/scala/org/apache/spark/SparkFunSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.spark

// scalastyle:off
import java.io.File
import java.nio.file.Path
import java.util.{Locale, TimeZone}
Expand All @@ -27,8 +26,9 @@ import scala.collection.mutable.ArrayBuffer

import org.apache.commons.io.FileUtils
import org.apache.logging.log4j._
import org.apache.logging.log4j.core.appender.AbstractAppender
import org.apache.logging.log4j.core.{LogEvent, Logger, LoggerContext}
import org.apache.logging.log4j.core.appender.AbstractAppender
import org.apache.logging.log4j.core.config.Property
import org.scalatest.{BeforeAndAfter, BeforeAndAfterAll, BeforeAndAfterEach, Failed, Outcome}
import org.scalatest.funsuite.AnyFunSuite

Expand Down Expand Up @@ -265,7 +265,7 @@ abstract class SparkFunSuite
}

class LogAppender(msg: String = "", maxEvents: Int = 1000)
extends AbstractAppender("logAppender", null, null) {
extends AbstractAppender("logAppender", null, null, true, Property.EMPTY_ARRAY) {
private val _loggingEvents = new ArrayBuffer[LogEvent]()
private var _threshold: Level = Level.INFO

Expand Down