[SPARK-47488][k8s]fix driver pod stuck when driver on k8s #45667
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,6 +45,7 @@ import org.apache.spark.internal.config.UI._ | |
| import org.apache.spark.launcher.SparkLauncher | ||
| import org.apache.spark.util._ | ||
| import org.apache.spark.util.ArrayImplicits._ | ||
| import org.apache.spark.util.SparkExitCode.EXIT_FAILURE | ||
|
|
||
| /** | ||
| * Whether to submit, kill, or request the status of an application. | ||
|
|
@@ -983,11 +984,19 @@ private[spark] class SparkSubmit extends Logging { | |
| e | ||
| } | ||
|
|
||
| var DriverPodIsNormal: Boolean = if (args.master.startsWith("k8s")) true else false | ||
| var driverThrow: Throwable = null | ||
| try { | ||
| app.start(childArgs.toArray, sparkConf) | ||
| } catch { | ||
| case t: Throwable => | ||
| logWarning("Some ERR/Exception happened when app is running.") | ||
| if (args.master.startsWith("k8s")) { | ||
| DriverPodIsNormal = false | ||
| driverThrow = t | ||
| } else { | ||
| throw findCause(t) | ||
| } | ||
| } finally { | ||
| if (args.master.startsWith("k8s") && !isShell(args.primaryResource) && | ||
| !isSqlShell(args.mainClass) && !isThriftServer(args.mainClass) && | ||
|
|
@@ -996,6 +1005,13 @@ private[spark] class SparkSubmit extends Logging { | |
| SparkContext.getActive.foreach(_.stop()) | ||
| } catch { | ||
| case e: Throwable => logError(s"Failed to close SparkContext: $e") | ||
| } finally { | ||
| if (SparkContext.getActive.isEmpty) { | ||
| if (!DriverPodIsNormal) { | ||
| logError(s"Driver Pod will exit because: $driverThrow") | ||
| System.exit(EXIT_FAILURE) | ||
|
There was a problem hiding this comment. Could you provide the YARN code link for this case? Specifically,
There was a problem hiding this comment. Here is yarn exit code. There was a problem hiding this comment. What is the YARN exit code for your case? According to your PR description, it's not clear, @littlelittlewhite09 . It would be described in the PR description.
|
||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
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.
Did you want to use
DriverPodIsNormalhere?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.
Yes,
DriverPodIsNormalapplied here may be better.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.
Then, please use it.