[SPARK-45093][CONNECT][PYTHON] Properly support error handling and conversion for AddArtifactHandler #44092
+93
−13
Conversation
This file contains hidden or 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
grundprinzip
changed the title
grundprinzip
changed the title
|
@hvanhovell @HyukjinKwon PTAL |
HyukjinKwon
changed the title
|
cc @juliuszsompolski @cdkrot @heyihong mind taking a look please? |
HyukjinKwon
approved these changes
Dec 1, 2023
...er/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAddArtifactsHandler.scala
Outdated
Show resolved
Hide resolved
connector/connect/server/src/main/scala/org/apache/spark/sql/connect/utils/ErrorUtils.scala
Outdated
Show resolved
Hide resolved
| val partial: PartialFunction[Throwable, Throwable] = { | ||
| case e: Throwable if e.isInstanceOf[SparkThrowable] || NonFatal.apply(e) => | ||
| StatusProto.toStatusRuntimeException(buildStatusFromThrowable(e, sessionHolderOpt)) | ||
| case e: StatusRuntimeException => e |
There was a problem hiding this comment.
this case is not present in the query handleError, why it's a case needed here?
There was a problem hiding this comment.
In the original query error case, I was very certain that the error conversion does not happen inside the try block. Let me research why I added this (or if I was just cautious)
cdkrot
reviewed
Dec 1, 2023
connector/connect/server/src/main/scala/org/apache/spark/sql/connect/utils/ErrorUtils.scala
Outdated
Show resolved
Hide resolved
heyihong
reviewed
Dec 1, 2023
connector/connect/server/src/main/scala/org/apache/spark/sql/connect/utils/ErrorUtils.scala
Show resolved
Hide resolved
heyihong
reviewed
Dec 1, 2023
...er/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAddArtifactsHandler.scala
Outdated
Show resolved
Hide resolved
|
Merged to master. |
asl3
pushed a commit
to asl3/spark
that referenced
this pull request
Dec 5, 2023
…nversion for AddArtifactHandler ### What changes were proposed in this pull request? This patch improves the error handling when errors are happening in the `AddArtifact` path. In particular, the `AddArtifactHandler` would not properly return exceptions but all exceptions would end up yielding `UNKNOWN` errors. This patch makes sure we wrap the errors in the add artifact path the same way as we're wrapping the errors in the normal query execution path. In addition, it adds tests and verification for this behavior in Scala and in Python. ### Why are the changes needed? Stability ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Added UT for Scala and Python ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#44092 from grundprinzip/SPARK-ADD_ARTIFACT_CRAP. Authored-by: Martin Grund <martin.grund@databricks.com> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
dbatomic
pushed a commit
to dbatomic/spark
that referenced
this pull request
Dec 11, 2023
…nversion for AddArtifactHandler ### What changes were proposed in this pull request? This patch improves the error handling when errors are happening in the `AddArtifact` path. In particular, the `AddArtifactHandler` would not properly return exceptions but all exceptions would end up yielding `UNKNOWN` errors. This patch makes sure we wrap the errors in the add artifact path the same way as we're wrapping the errors in the normal query execution path. In addition, it adds tests and verification for this behavior in Scala and in Python. ### Why are the changes needed? Stability ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Added UT for Scala and Python ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#44092 from grundprinzip/SPARK-ADD_ARTIFACT_CRAP. Authored-by: Martin Grund <martin.grund@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?
This patch improves the error handling when errors are happening in the
AddArtifactpath. In particular, theAddArtifactHandlerwould not properly return exceptions but all exceptions would end up yieldingUNKNOWNerrors. This patch makes sure we wrap the errors in the add artifact path the same way as we're wrapping the errors in the normal query execution path.In addition, it adds tests and verification for this behavior in Scala and in Python.
Why are the changes needed?
Stability
Does this PR introduce any user-facing change?
No
How was this patch tested?
Added UT for Scala and Python
Was this patch authored or co-authored using generative AI tooling?
No