Skip to content

[SPARK-42699][CONNECT] SparkConnectServer should make client and AM same exit code #40315

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

[SPARK-42699][CONNECT] SparkConnectServer should make client and AM same exit code #40315

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
25be4cf
[SPARK-42699][CONNECTOR] SparkConnectServer should make client and AM…
AngersZhuuuu Mar 7, 2023
73f5276
Update SparkSession.scala
AngersZhuuuu Mar 8, 2023
10142bd
Update CheckConnectJvmClientCompatibility.scala
AngersZhuuuu Mar 9, 2023
eeb13ac
Merge remote-tracking branch 'upstream/master' into SPARK-42699
AngersZhuuuu Apr 7, 2023
7e5cf94
Update SparkSession.scala
AngersZhuuuu Apr 7, 2023
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
1 change: 1 addition & 0 deletions ...c/test/scala/org/apache/spark/sql/connect/client/CheckConnectJvmClientCompatibility.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ object CheckConnectJvmClientCompatibility {
ProblemFilters.exclude[Problem]("org.apache.spark.sql.SparkSession.executeCommand"),
ProblemFilters.exclude[Problem]("org.apache.spark.sql.SparkSession.readStream"),
ProblemFilters.exclude[Problem]("org.apache.spark.sql.SparkSession.this"),
ProblemFilters.exclude[Problem]("org.apache.spark.sql.SparkSession.stop"),

// RuntimeConfig
ProblemFilters.exclude[Problem]("org.apache.spark.sql.RuntimeConfig.this"),
Expand Down
6 changes: 4 additions & 2 deletions ...nnect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,20 @@ object SparkConnectServer extends Logging {
// Set the active Spark Session, and starts SparkEnv instance (via Spark Context)
logInfo("Starting Spark session.")
val session = SparkSession.builder.getOrCreate()
var exitCode = 0
try {
try {
SparkConnectService.start()
logInfo("Spark Connect server started.")
} catch {
case e: Exception =>
logError("Error starting Spark Connect server", e)
System.exit(-1)
exitCode = -1
System.exit(exitCode)
}
SparkConnectService.server.awaitTermination()
} finally {
session.stop()
session.stop(exitCode)
}
}
}
11 changes: 10 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,14 +753,23 @@ class SparkSession private(
// scalastyle:on

/**
* Stop the underlying `SparkContext`.
* Stop the underlying `SparkContext` with default exit code 0.
*
* @since 2.0.0
Copy link
Member

@HyukjinKwon HyukjinKwon Mar 8, 2023

Choose a reason for hiding this comment

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

You should have the new docs for the one for exitCode with new @since

Copy link
Contributor Author

@AngersZhuuuu AngersZhuuuu Mar 8, 2023

Choose a reason for hiding this comment

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

How about current?

*/
def stop(): Unit = {
sparkContext.stop()
}

/**
* Stop the underlying `SparkContext` with exit code that will passed to scheduler backend.
*
* @since 3.5.0
*/
def stop(exitCode: Int): Unit = {
sparkContext.stop(exitCode)
}

/**
* Synonym for `stop()`.
*
Expand Down