-
Notifications
You must be signed in to change notification settings - Fork 301
[AutoSparkUT] Fix GPU missing-file recovery guidance [reduced-it] [fast-ut] [databricks] #15835
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.
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
Open
wjxiz1992
wants to merge
8
commits into
NVIDIA:main
Choose a base branch
from
wjxiz1992:codex/fix-15511-orc-missing-file-guidance
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+573
−41
Open
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
07c1035
Fix GPU missing-file recovery guidance
wjxiz1992 234f8dc
Handle missing files thrown from datasource next
wjxiz1992 98650a4
Require explicit missing-file recovery policy
wjxiz1992 c1e1a06
Fix Spark 4 missing-file structured errors
wjxiz1992 ad6d7a5
Fix AsyncRunners copyright year
wjxiz1992 844a13f
Merge branch 'main' into codex/fix-15511-orc-missing-file-guidance
wjxiz1992 3118411
Merge branch 'main' into codex/fix-15511-orc-missing-file-guidance
wjxiz1992 43d7940
Fix GpuDataSourceRDD import order
wjxiz1992 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
44 changes: 44 additions & 0 deletions
44
sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuFileNotFoundException.scala
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Copyright (c) 2026, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.nvidia.spark.rapids | ||
|
|
||
| import java.io.FileNotFoundException | ||
|
|
||
| /** | ||
| * Carries the owning file path across an asynchronous reader boundary. | ||
| * | ||
| * Spark 4.x needs the path to construct `FAILED_READ_FILE.FILE_NOT_EXIST`, but a | ||
| * `Future.get()` otherwise exposes only the reader's `FileNotFoundException`. | ||
| */ | ||
| object GpuFileNotFoundException { | ||
| private final class WithPath( | ||
| val filePath: String, | ||
| val originalException: FileNotFoundException) | ||
| extends FileNotFoundException(originalException.getMessage) { | ||
| initCause(originalException) | ||
| } | ||
|
|
||
| def apply(filePath: String, error: FileNotFoundException): FileNotFoundException = error match { | ||
| case pathError: WithPath => pathError | ||
| case _ => new WithPath(filePath, error) | ||
| } | ||
|
|
||
| def unapply(error: FileNotFoundException): Option[(String, FileNotFoundException)] = error match { | ||
| case pathError: WithPath => Some((pathError.filePath, pathError.originalException)) | ||
| case _ => None | ||
| } | ||
| } |
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,13 +16,18 @@ | |
|
|
||
| package com.nvidia.spark.rapids.shims | ||
|
|
||
| import com.nvidia.spark.rapids.{FileSystemBytesReadTracker, MetricsBatchIterator, PartitionIterator} | ||
| import java.io.FileNotFoundException | ||
| import java.util.concurrent.ExecutionException | ||
|
|
||
| import com.nvidia.spark.rapids.{FileSystemBytesReadTracker, GpuFileNotFoundException, | ||
| MetricsBatchIterator, PartitionIterator} | ||
| import com.nvidia.spark.rapids.ScalableTaskCompletion.onTaskCompletion | ||
|
|
||
| import org.apache.spark.{InterruptibleIterator, Partition, SparkContext, SparkException, TaskContext} | ||
| import org.apache.spark.rdd.RDD | ||
| import org.apache.spark.sql.catalyst.InternalRow | ||
| import org.apache.spark.sql.connector.read.{InputPartition, PartitionReaderFactory} | ||
| import org.apache.spark.sql.execution.datasources.FilePartition | ||
| import org.apache.spark.sql.vectorized.ColumnarBatch | ||
|
|
||
| /** | ||
|
|
@@ -33,7 +38,8 @@ import org.apache.spark.sql.vectorized.ColumnarBatch | |
| class GpuDataSourceRDD( | ||
| sc: SparkContext, | ||
| @transient private val inputPartitions: Seq[Seq[InputPartition]], | ||
| partitionReaderFactory: PartitionReaderFactory | ||
| partitionReaderFactory: PartitionReaderFactory, | ||
| includeRefreshHint: Boolean | ||
| ) extends RDD[InternalRow](sc, Nil) { | ||
| import GpuDataSourceRDD.GpuDataSourceRDDPartition | ||
|
|
||
|
|
@@ -59,13 +65,25 @@ class GpuDataSourceRDD( | |
| private val inputPartitions = castPartition(split).inputPartitions | ||
| private var currentIter: Option[Iterator[Object]] = None | ||
| private var currentIndex: Int = 0 | ||
| private var currentInputPartition: InputPartition = _ | ||
|
|
||
| override def hasNext: Boolean = { | ||
| override def hasNext: Boolean = try { | ||
| val result = currentIter.exists(_.hasNext) || advanceToNextIter() | ||
| if (!result) { | ||
| bytesReadTracker.update() | ||
| } | ||
| result | ||
| } catch { | ||
| case e: FileNotFoundException => | ||
| throw GpuDataSourceRDD.missingFileError( | ||
| e, includeRefreshHint, currentInputPartition) | ||
| case e: ExecutionException => | ||
| e.getCause match { | ||
| case cause: FileNotFoundException => | ||
| throw GpuDataSourceRDD.missingFileError( | ||
| cause, includeRefreshHint, currentInputPartition) | ||
| case _ => throw e | ||
| } | ||
| } | ||
|
|
||
| override def next(): Object = { | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated. |
||
|
|
@@ -74,6 +92,17 @@ class GpuDataSourceRDD( | |
| throw new NoSuchElementException("No more elements") | ||
| } | ||
| currentIter.get.next() | ||
| } catch { | ||
| case e: FileNotFoundException => | ||
| throw GpuDataSourceRDD.missingFileError( | ||
| e, includeRefreshHint, currentInputPartition) | ||
| case e: ExecutionException => | ||
| e.getCause match { | ||
| case cause: FileNotFoundException => | ||
| throw GpuDataSourceRDD.missingFileError( | ||
| cause, includeRefreshHint, currentInputPartition) | ||
| case _ => throw e | ||
| } | ||
| } finally { | ||
| bytesReadTracker.update() | ||
| } | ||
|
|
@@ -84,6 +113,7 @@ class GpuDataSourceRDD( | |
| false | ||
| } else { | ||
| val inputPartition = inputPartitions(currentIndex) | ||
| currentInputPartition = inputPartition | ||
| currentIndex += 1 | ||
|
|
||
| // TODO: SPARK-25083 remove the type erasure hack in data source scan | ||
|
|
@@ -112,14 +142,35 @@ class GpuDataSourceRDD( | |
| } | ||
|
|
||
| object GpuDataSourceRDD { | ||
| private def missingFileError( | ||
| error: FileNotFoundException, | ||
| includeRefreshHint: Boolean, | ||
| inputPartition: InputPartition): Throwable = { | ||
| val (filePath, originalError) = error match { | ||
| case GpuFileNotFoundException(path, originalException) => | ||
| (Some(path), originalException) | ||
| case _ => | ||
| (singleFilePath(inputPartition), error) | ||
| } | ||
| MissingFileErrorShim.convert(filePath, originalError, includeRefreshHint) | ||
| } | ||
|
|
||
| private def singleFilePath(inputPartition: InputPartition): Option[String] = { | ||
| Option(inputPartition).collect { case filePartition: FilePartition => | ||
| SparkShimImpl.getPartitionFiles(filePartition) | ||
| }.filter(_.length == 1).map(_.head.filePath.toString) | ||
| } | ||
|
|
||
| private case class GpuDataSourceRDDPartition( | ||
| override val index: Int, | ||
| inputPartitions: Seq[InputPartition]) extends Partition | ||
|
|
||
| def apply( | ||
| sc: SparkContext, | ||
| inputPartitions: Seq[InputPartition], | ||
| partitionReaderFactory: PartitionReaderFactory): GpuDataSourceRDD = { | ||
| new GpuDataSourceRDD(sc, inputPartitions.map(Seq(_)), partitionReaderFactory) | ||
| partitionReaderFactory: PartitionReaderFactory, | ||
| includeRefreshHint: Boolean): GpuDataSourceRDD = { | ||
| new GpuDataSourceRDD( | ||
| sc, inputPartitions.map(Seq(_)), partitionReaderFactory, includeRefreshHint) | ||
| } | ||
| } | ||
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
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
79 changes: 79 additions & 0 deletions
79
sql-plugin/src/main/spark330/scala/com/nvidia/spark/rapids/shims/MissingFileErrorShim.scala
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Copyright (c) 2026, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| /*** spark-rapids-shim-json-lines | ||
| {"spark": "330"} | ||
| {"spark": "330db"} | ||
| {"spark": "331"} | ||
| {"spark": "332"} | ||
| {"spark": "332db"} | ||
| {"spark": "333"} | ||
| {"spark": "334"} | ||
| {"spark": "340"} | ||
| {"spark": "341"} | ||
| {"spark": "342"} | ||
| {"spark": "343"} | ||
| {"spark": "344"} | ||
| {"spark": "350"} | ||
| {"spark": "350db143"} | ||
| {"spark": "351"} | ||
| {"spark": "352"} | ||
| {"spark": "353"} | ||
| {"spark": "354"} | ||
| {"spark": "355"} | ||
| {"spark": "356"} | ||
| {"spark": "357"} | ||
| {"spark": "358"} | ||
| {"spark": "359"} | ||
| spark-rapids-shim-json-lines ***/ | ||
| package com.nvidia.spark.rapids.shims | ||
|
|
||
| import java.io.FileNotFoundException | ||
|
|
||
| import org.apache.spark.sql.connector.read.PartitionReaderFactory | ||
|
|
||
| object MissingFileErrorShim { | ||
| private val RECREATE_HINT = "recreating the Dataset/DataFrame involved" | ||
| private val REFRESH_HINT = "REFRESH TABLE" | ||
|
|
||
| def wrapReaderFactory(readerFactory: PartitionReaderFactory): PartitionReaderFactory = | ||
| readerFactory | ||
|
|
||
| def convert( | ||
| filePath: Option[String], | ||
| error: FileNotFoundException, | ||
| includeRefreshHint: Boolean): Throwable = { | ||
| val message = Option(error.getMessage).getOrElse(error.toString) | ||
| if (message.contains(RECREATE_HINT) && | ||
| (!includeRefreshHint || message.contains(REFRESH_HINT))) { | ||
| error | ||
| } else { | ||
| val recoveryHint = if (includeRefreshHint) { | ||
| "It is possible the underlying files have been updated. " + | ||
| "You can explicitly invalidate the cache in Spark by " + | ||
| "running 'REFRESH TABLE tableName' command in SQL or " + | ||
| "by recreating the Dataset/DataFrame involved." | ||
| } else { | ||
| "It is possible the underlying files have been updated. " + | ||
| "You can explicitly invalidate the cache in Spark by " + | ||
| "recreating the Dataset/DataFrame involved." | ||
| } | ||
| val enrichedException = new FileNotFoundException(s"$message\n$recoveryHint") | ||
| enrichedException.initCause(error) | ||
| enrichedException | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fileis a HadoopPathhere. For a local URI,Path.toStringnormalizesfile:///tmp/xtofile:/tmp/x, while Spark's structured error and the new test use the full URI. If the failure surfaces during the asynchronous block copy, the GPUpathparameter can therefore differ from CPU. Could we carry the original URI or usefile.toUri.toString, and cover this failure point?