You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "heyihong (via GitHub)" <gi...@apache.org> on 2023/07/28 15:44:18 UTC
[GitHub] [spark] heyihong opened a new pull request, #42212: [SPARK-44587] Increase Protobuf Marshaller Recursion Limit
heyihong opened a new pull request, #42212:
URL: https://github.com/apache/spark/pull/42212
<!--
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
'core/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.
-->
- Customize spark connect grpc method
- Increase Protobuf marshaller recursion limit
### 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.
-->
- Nested DFs fail easily
### 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 "connect-client-jvm/testOnly *ClientE2ETestSuite"`
--
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
[GitHub] [spark] juliuszsompolski commented on pull request #42212: [SPARK-44587] Increase protobuf marshaller recursion limit
Posted by "juliuszsompolski (via GitHub)" <gi...@apache.org>.
juliuszsompolski commented on PR #42212:
URL: https://github.com/apache/spark/pull/42212#issuecomment-1657223608
LGTM. Should also go to branch-3.5.
--
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
[GitHub] [spark] juliuszsompolski commented on a diff in pull request #42212: [SPARK-44587] Increase Protobuf Marshaller Recursion Limit
Posted by "juliuszsompolski (via GitHub)" <gi...@apache.org>.
juliuszsompolski commented on code in PR #42212:
URL: https://github.com/apache/spark/pull/42212#discussion_r1277748268
##########
connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectService.scala:
##########
@@ -161,6 +168,54 @@ class SparkConnectService(debug: Boolean)
userId = request.getUserContext.getUserId,
sessionId = request.getSessionId)
}
+
+ // customizedMethodDesc returns a customized MethodDescriptor
+ // with updated request and response marshallers.
+ private def customizedMethodDesc(
Review Comment:
nit: actually naming it methodWithCustomMarshallers will be self descriptive enough to likely not need the comment anymore
(which I know I asked for comments a moment ago, but now as I understand it, I see better how to make it self-descriptive without comments)
##########
connector/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectService.scala:
##########
@@ -161,6 +168,54 @@ class SparkConnectService(debug: Boolean)
userId = request.getUserContext.getUserId,
sessionId = request.getSessionId)
}
+
+ // customizedMethodDesc returns a customized MethodDescriptor
+ // with updated request and response marshallers.
+ private def customizedMethodDesc(
+ methodDef: MethodDescriptor[MessageLite, MessageLite]
+ ): MethodDescriptor[MessageLite, MessageLite] = {
+ val recursionLimit =
+ SparkEnv.get.conf.get(CONNECT_GRPC_MARSHALLER_RECURSION_LIMIT)
+ val requestMarshaller =
+ ProtoLiteUtils.marshallerWithRecursionLimit(
+ methodDef
+ .getRequestMarshaller
+ .asInstanceOf[PrototypeMarshaller[MessageLite]]
+ .getMessagePrototype,
+ recursionLimit
+ )
+ val responseMarshaller =
+ ProtoLiteUtils.marshallerWithRecursionLimit(
+ methodDef
+ .getResponseMarshaller
+ .asInstanceOf[PrototypeMarshaller[MessageLite]]
+ .getMessagePrototype,
+ recursionLimit
+ )
+ methodDef.toBuilder(requestMarshaller, responseMarshaller).build()
Review Comment:
nit: Would be more self-documenting as
```
methodDef.toBuilder
.setRequestMarshaller(requestMarshaller)
.setResponseMarshaller(responseMarshaller)
.build()
```
instead of the shorthand method
--
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
[GitHub] [spark] HyukjinKwon closed pull request #42212: [SPARK-44587][SQL][CONNECT] Increase protobuf marshaller recursion limit
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon closed pull request #42212: [SPARK-44587][SQL][CONNECT] Increase protobuf marshaller recursion limit
URL: https://github.com/apache/spark/pull/42212
--
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
[GitHub] [spark] juliuszsompolski commented on a diff in pull request #42212: [SPARK-44587] Increase Protobuf Marshaller Recursion Limit
Posted by "juliuszsompolski (via GitHub)" <gi...@apache.org>.
juliuszsompolski commented on code in PR #42212:
URL: https://github.com/apache/spark/pull/42212#discussion_r1277746582
##########
connector/connect/server/src/main/scala/org/apache/spark/sql/connect/config/Connect.scala:
##########
@@ -121,4 +121,14 @@ object Connect {
.version("3.5.0")
.booleanConf
.createWithDefault(false)
+
+ val CONNECT_GRPC_MARSHALLER_RECURSION_LIMIT =
+ ConfigBuilder("spark.connect.grpc.marshallerRecursionLimit")
+ .doc(
+ """
+ |Sets the recursion limit to grpc protobuf messages.
+ |""".stripMargin)
+ .version("3.5.0")
+ .intConf
+ .createWithDefault(1024)
Review Comment:
should this config be `.internal()`?
(though that question could be ask of multiple other configs in this file - should they be internal; currently none are internal?)
(Edit: actually CONNECT_COPY_FROM_LOCAL_TO_FS_ALLOW_DEST_LOCAL is internal, but none of the others...)
--
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
[GitHub] [spark] juliuszsompolski commented on a diff in pull request #42212: [SPARK-44587] Increase Protobuf Marshaller Recursion Limit
Posted by "juliuszsompolski (via GitHub)" <gi...@apache.org>.
juliuszsompolski commented on code in PR #42212:
URL: https://github.com/apache/spark/pull/42212#discussion_r1277746582
##########
connector/connect/server/src/main/scala/org/apache/spark/sql/connect/config/Connect.scala:
##########
@@ -121,4 +121,14 @@ object Connect {
.version("3.5.0")
.booleanConf
.createWithDefault(false)
+
+ val CONNECT_GRPC_MARSHALLER_RECURSION_LIMIT =
+ ConfigBuilder("spark.connect.grpc.marshallerRecursionLimit")
+ .doc(
+ """
+ |Sets the recursion limit to grpc protobuf messages.
+ |""".stripMargin)
+ .version("3.5.0")
+ .intConf
+ .createWithDefault(1024)
Review Comment:
should this config be `.internal()`?
(though that question could be ask of multiple other configs in this file - should they be internal; currently none are internal?)
--
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
[GitHub] [spark] juliuszsompolski commented on a diff in pull request #42212: [SPARK-44587] Increase Protobuf Marshaller Recursion Limit
Posted by "juliuszsompolski (via GitHub)" <gi...@apache.org>.
juliuszsompolski commented on code in PR #42212:
URL: https://github.com/apache/spark/pull/42212#discussion_r1277747770
##########
connector/connect/server/src/main/scala/org/apache/spark/sql/connect/config/Connect.scala:
##########
@@ -121,4 +121,14 @@ object Connect {
.version("3.5.0")
.booleanConf
.createWithDefault(false)
+
+ val CONNECT_GRPC_MARSHALLER_RECURSION_LIMIT =
+ ConfigBuilder("spark.connect.grpc.marshallerRecursionLimit")
+ .doc(
+ """
+ |Sets the recursion limit to grpc protobuf messages.
+ |""".stripMargin)
+ .version("3.5.0")
+ .intConf
+ .createWithDefault(1024)
Review Comment:
@hvanhovell @grundprinzip should more configs in this file be internal?
--
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
[GitHub] [spark] juliuszsompolski commented on a diff in pull request #42212: [SPARK-44587] Increase protobuf marshaller recursion limit
Posted by "juliuszsompolski (via GitHub)" <gi...@apache.org>.
juliuszsompolski commented on code in PR #42212:
URL: https://github.com/apache/spark/pull/42212#discussion_r1278589544
##########
connector/connect/server/src/main/scala/org/apache/spark/sql/connect/config/Connect.scala:
##########
@@ -134,4 +134,15 @@ object Connect {
.version("3.5.0")
.intConf
.createWithDefault(200)
+
+ val CONNECT_GRPC_MARSHALLER_RECURSION_LIMIT =
+ ConfigBuilder("spark.connect.grpc.marshallerRecursionLimit")
+ .internal()
+ .doc(
+ """
+ |Sets the recursion limit to grpc protobuf messages.
+ |""".stripMargin)
+ .version("3.5.0")
+ .intConf
+ .createWithDefault(1024)
Review Comment:
nit: place together with other CONNECT_GRPC configs.
--
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
[GitHub] [spark] HyukjinKwon commented on pull request #42212: [SPARK-44587][SQL][CONNECT] Increase protobuf marshaller recursion limit
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #42212:
URL: https://github.com/apache/spark/pull/42212#issuecomment-1657329979
Merged to master and branch-3.5.
--
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