You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "changgyoopark-db (via GitHub)" <gi...@apache.org> on 2024/06/18 08:08:00 UTC
[PR] [SPARK-47986][CONNECT][SCALA] Unable to create a new session when the default session is closed by the server [spark]
changgyoopark-db opened a new pull request, #47008:
URL: https://github.com/apache/spark/pull/47008
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'common/utils/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
This is a Scala port of https://github.com/apache/spark/pull/46221 and https://github.com/apache/spark/pull/46435.
A client is unaware of a server restart or the server having closed the client until it receives an error. However, at this point, the client in unable to create a new session to the same connect endpoint, since the stale session is still recorded
as the active and default session.
With this change, when the server communicates that the session has changed via a GRPC error, the session and the respective client are marked as stale, thereby allowing a new default connection can be created via the session builder.
In some cases, particularly when running older versions of the Spark cluster (3.5), the error actually manifests as a mismatch in the observed server-side session id between calls. With this fix, we also capture this case and ensure that this case is
also handled.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
Being unable to use getOrCreate() after an error is unacceptable and should be fixed.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
./build/sbt testOnly *SparkSessionE2ESuite
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
No
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47986][CONNECT][FOLLOW-UP] Unable to create a new session when the default session is closed by the server [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #47008:
URL: https://github.com/apache/spark/pull/47008#issuecomment-2177412239
Looks fine but would be great to have looks from @nija-at and @juliuszsompolski
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47986][CONNECT][FOLLOW-UP] Unable to create a new session when the default session is closed by the server [spark]
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on code in PR #47008:
URL: https://github.com/apache/spark/pull/47008#discussion_r1645304636
##########
connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/SparkSession.scala:
##########
@@ -1024,7 +1037,14 @@ object SparkSession extends Logging {
*/
def getOrCreate(): SparkSession = {
val session = tryCreateSessionFromClient()
- .getOrElse(sessions.get(builder.configuration))
+ .getOrElse({
+ var existingSession = sessions.get(builder.configuration)
Review Comment:
Do we need a lock here for `sessions`?
##########
connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/SparkSession.scala:
##########
@@ -1036,7 +1056,8 @@ object SparkSession extends Logging {
*
* @since 3.5.0
*/
- def getDefaultSession: Option[SparkSession] = Option(defaultSession.get())
+ def getDefaultSession: Option[SparkSession] =
+ Option(defaultSession.get()).filterNot(s => s.client != null && s.client.hasSessionChanged)
Review Comment:
I wonder if we can use the same naming with the Python side so we can easily land the same fix at both sides in the future.
##########
connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/SparkSessionE2ESuite.scala:
##########
@@ -382,4 +382,43 @@ class SparkSessionE2ESuite extends ConnectFunSuite with RemoteSparkSession {
.create()
}
}
+
+ test("get or create after session changed") {
Review Comment:
```suggestion
test("SPARK-47986: get or create after session changed") {
```
##########
connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/SparkSessionE2ESuite.scala:
##########
@@ -382,4 +382,43 @@ class SparkSessionE2ESuite extends ConnectFunSuite with RemoteSparkSession {
.create()
}
}
+
+ test("get or create after session changed") {
+ val remote = s"sc://localhost:$serverPort"
+ SparkSession.clearDefaultSession()
+ SparkSession.clearActiveSession()
+
+ val session1 = SparkSession
+ .builder()
+ .remote(remote)
+ .getOrCreate()
+
+ assert(session1 eq SparkSession.getActiveSession.get)
+ assert(session1 eq SparkSession.getDefaultSession.get)
+ assert(session1.range(3).collect().length == 3)
+
+ session1.client.hijackServerSideSessionIdForTesting("-testing")
+
+ try {
Review Comment:
Maybe:
```scala
val e = intercept[StatusRuntimeException] {
session1.range(3).analyze
}
assert(e.getMessage.contains("INVALID_HANDLE.SESSION_CHANGED"))
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org