Skip to content

[SPARK-54551][CONNECT][TESTS][FOLLOWUP] Redirect Test Spark connect server output stream to files #53275

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+17 −26
Open

[SPARK-54551][CONNECT][TESTS][FOLLOWUP] Redirect Test Spark connect server output stream to files #53275

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
c0838bc
Redirect Test Spark connect server output stream to files
vinodkc Dec 2, 2025
2063488
Fix code review comments
vinodkc Dec 2, 2025
0f8a36f
Always persist the server log to unit-tests.log
vinodkc Dec 2, 2025
cf40405
Fix scala fmt
vinodkc Dec 2, 2025
cd8e5a2
Renamed IntegrationTestUtils.debugConfigs to log4jConfigs and removed…
vinodkc Dec 2, 2025
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
30 changes: 14 additions & 16 deletions ...ct/client/jvm/src/test/scala/org/apache/spark/sql/connect/test/IntegrationTestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,21 @@ object IntegrationTestUtils {
s"$connectClientHomeDir/target/$scalaDir/test-classes"
}

private[sql] def debugConfigs: Seq[String] = {
private[sql] def log4jConfigs: Seq[String] = {
val log4j2 = s"$connectClientHomeDir/src/test/resources/log4j2.properties"
if (isDebug) {
Seq(
// Enable to see the server plan change log
// "--conf",
// "spark.sql.planChangeLog.level=WARN",

// Enable to see the server grpc received
// "--conf",
// "spark.connect.grpc.interceptor.classes=" +
// "org.apache.spark.sql.connect.service.LoggingInterceptor",

// Redirect server log into console
"--conf",
s"spark.driver.extraJavaOptions=-Dlog4j.configurationFile=$log4j2")
} else Seq.empty
Seq(
// Enable to see the server plan change log
// "--conf",
// "spark.sql.planChangeLog.level=WARN",

// Enable to see the server grpc received
// "--conf",
// "spark.connect.grpc.interceptor.classes=" +
// "org.apache.spark.sql.connect.service.LoggingInterceptor",

// Redirect server log into console
"--conf",
s"spark.driver.extraJavaOptions=-Dlog4j.configurationFile=$log4j2")
}

// Log server start stop debug info into console
Expand Down
13 changes: 3 additions & 10 deletions ...nect/client/jvm/src/test/scala/org/apache/spark/sql/connect/test/RemoteSparkSession.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ object SparkConnectServerUtils {
command += "--jars" += catalystTestJar
command += "--conf" += s"spark.connect.grpc.binding.port=$port"
command ++= testConfigs
command ++= debugConfigs
command ++= log4jConfigs
command += connectJar
val cmds = command.result()
debug {
Expand All @@ -90,15 +90,8 @@ object SparkConnectServerUtils {
builder.directory(new File(sparkHome))
val environment = builder.environment()
environment.remove("SPARK_DIST_CLASSPATH")
if (isDebug) {
builder.redirectError(Redirect.INHERIT)
builder.redirectOutput(Redirect.INHERIT)
} else {
// If output is not consumed, the stdout/stderr pipe buffers will fill up,
// causing the server process to block on write() calls
builder.redirectError(Redirect.DISCARD)
builder.redirectOutput(Redirect.DISCARD)
}
builder.redirectError(Redirect.INHERIT)
builder.redirectOutput(Redirect.INHERIT)

val process = builder.start()
consoleOut = process.getOutputStream
Expand Down