[SPARK-49548][CONNECT] Replace coarse-locking in SparkConnectSessionManager with ConcurrentMap #48036
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
changgyoopark-db
force-pushed
the
SPARK-49548
branch
from
40d0ec4 to
259d5cd
Compare
changgyoopark-db
changed the title
|
@juliuszsompolski Can you please review this PR (as you're the one who wrote the majority of the code in this file)? Thanks! |
.../server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectSessionManager.scala
Outdated
Show resolved
Hide resolved
changgyoopark-db
force-pushed
the
SPARK-49548
branch
from
259d5cd to
ae4c5c0
Compare
juliuszsompolski
approved these changes
Sep 10, 2024
|
@hvanhovell @HyukjinKwon Hello Herman and Hyukjin, would you mind merging this PR? Thanks! |
|
@grundprinzip Hi Martin, can you review and merge this change too? Thanks a lot! |
| scheduledExecutor.foreach { executor => | ||
| ThreadUtils.shutdown(executor, FiniteDuration(1, TimeUnit.MINUTES)) | ||
| private[connect] def shutdown(): Unit = { | ||
| sessionsLock.synchronized { |
There was a problem hiding this comment.
Can you add Julek's comment here on why sessionLock is needed here?
There was a problem hiding this comment.
Thanks for reviewing this! As far as I understand, his comments address a potential data race between sessionStore and closedSessionsCache, and the data race can be resolved without relying on this particular lock: not quite related to this piece of code.
Locking here is to protect scheduledExecutor, and I think that is self-explanatory at line 55 (@GuardedBy("sessionsLock")).
There was a problem hiding this comment.
Ah I see the comment above 👍
allisonwang-db
approved these changes
Sep 11, 2024
| scheduledExecutor.foreach { executor => | ||
| ThreadUtils.shutdown(executor, FiniteDuration(1, TimeUnit.MINUTES)) | ||
| private[connect] def shutdown(): Unit = { | ||
| sessionsLock.synchronized { |
There was a problem hiding this comment.
Ah I see the comment above 👍
HyukjinKwon
approved these changes
Sep 11, 2024
|
Merged to master. |
attilapiros
pushed a commit
to attilapiros/spark
that referenced
this pull request
Oct 4, 2024
…anager with ConcurrentMap ### What changes were proposed in this pull request? Replace the coarse-locking in SparkConnectSessionManager with ConcurrentMap in order to minimise lock contention when there are many sessions. ### Why are the changes needed? It is a spin-off from apache#48034 where apache#48034 addresses many-execution cases whereas this addresses many-session situations. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing test cases. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#48036 from changgyoopark-db/SPARK-49548. Authored-by: Changgyoo Park <changgyoo.park@databricks.com> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
himadripal
pushed a commit
to himadripal/spark
that referenced
this pull request
Oct 19, 2024
…anager with ConcurrentMap ### What changes were proposed in this pull request? Replace the coarse-locking in SparkConnectSessionManager with ConcurrentMap in order to minimise lock contention when there are many sessions. ### Why are the changes needed? It is a spin-off from apache#48034 where apache#48034 addresses many-execution cases whereas this addresses many-session situations. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing test cases. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#48036 from changgyoopark-db/SPARK-49548. Authored-by: Changgyoo Park <changgyoo.park@databricks.com> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Replace the coarse-locking in SparkConnectSessionManager with ConcurrentMap in order to minimise lock contention when there are many sessions.
Why are the changes needed?
It is a spin-off from #48034 where #48034 addresses many-execution cases whereas this addresses many-session situations.
Does this PR introduce any user-facing change?
No.
How was this patch tested?
Existing test cases.
Was this patch authored or co-authored using generative AI tooling?
No.