Skip to content

[SPARK-43540][K8S][CORE] Add working directory into classpath on the driver in K8S cluster mode #41201

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.

Sign up for GitHub

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

Closed
turboFei wants to merge 7 commits into from
Closed

[SPARK-43540][K8S][CORE] Add working directory into classpath on the driver in K8S cluster mode #41201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
58b808c
[SPARK-43540][K8S][CORE] Add working directory into classpath on the …
turboFei May 17, 2023
413881b
minmize ut
turboFei May 17, 2023
5e9cfd3
logging format
turboFei May 17, 2023
33c287a
getCanonicalFile for source and dest - retest please
turboFei May 18, 2023
95f85d2
add into executor classpath
turboFei May 22, 2023
97b61ea
revert
turboFei May 31, 2023
11b5288
add working directory at the tail of the classpath
turboFei Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,9 @@ private[spark] class SparkSubmit extends Logging {
// directory too.
// SPARK-33782 : This downloads all the files , jars , archiveFiles and pyfiles to current
// working directory
// SPARK-43540: add current working directory into driver classpath
val workingDirectory = "."
childClasspath += workingDirectory
Copy link
Contributor

@advancedxy advancedxy May 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might affect other modes. A better place would be the entrypoint.sh for resource-managers/kubernetes/docker/src/main/dockerfiles/spark/entrypoint.sh to include work-dir into the classpath.

Copy link
Member Author

@turboFei turboFei May 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here we have checked the k8s cluster mode

if (isKubernetesClusterModeDriver) {
 ...
}

Copy link
Contributor

@advancedxy advancedxy May 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't add current working dir to executor's class path right?

Just checked with yarn's behavior, yarn add CWD to both driver and executor. And it puts CWD before localized SPARK_CONF and HADOOP_CONF.

See

spark/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala

Line 1442 in 014685c

addClasspathEntry(Environment.PWD.$$(), env)

To get the similar behavior, I believe it would be easier to leverage the entrypoint.sh here when running on K8S.

Copy link
Member Author

@turboFei turboFei May 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will check it

Copy link
Member Author

@turboFei turboFei May 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about now? @advancedxy
I checked the code, for driver, if just leverage the entrypoint.sh, it is difficult to keep the behavior as mentioned above.

So I just leverage the entrypoint.sh for executor.

Copy link
Contributor

@advancedxy advancedxy May 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Copy link
Member Author

@turboFei turboFei May 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

def downloadResourcesToCurrentDirectory(uris: String, isArchive: Boolean = false):
String = {
val resolvedUris = Utils.stringToSeq(uris).map(Utils.resolveURI)
Expand All @@ -423,13 +426,12 @@ private[spark] class SparkSubmit extends Logging {
targetDir, sparkConf, hadoopConf)
Utils.stringToSeq(localResources).map(Utils.resolveURI).zip(resolvedUris).map {
case (localResources, resolvedUri) =>
val source = new File(localResources.getPath)
val source = new File(localResources.getPath).getCanonicalFile
val dest = new File(
".",
workingDirectory,
if (resolvedUri.getFragment != null) resolvedUri.getFragment else source.getName)
logInfo(
s"Files $resolvedUri " +
s"from ${source.getAbsolutePath} to ${dest.getAbsolutePath}")
.getCanonicalFile
logInfo(s"Files $resolvedUri from $source to $dest")
Utils.deleteRecursively(dest)
if (isArchive) {
Utils.unpack(source, dest)
Expand Down
12 changes: 12 additions & 0 deletions core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1618,6 +1618,18 @@ class SparkSubmitSuite
conf.get(k) should be (v)
}
}

test("SPARK-43540: Add working directory into classpath on the driver in K8S cluster mode") {
val clArgs = Seq(
"--deploy-mode", "client",
"--master", "k8s://host:port",
"--class", "org.SomeClass",
"--conf", "spark.kubernetes.submitInDriver=true",
"/home/thejar.jar")
val appArgs = new SparkSubmitArguments(clArgs)
val (_, classpath, _, _) = submit.prepareSubmitEnvironment(appArgs)
assert(classpath.contains("."))
}
}

object JarCreationTest extends Logging {
Expand Down
3 changes: 3 additions & 0 deletions resource-managers/kubernetes/docker/src/main/dockerfiles/spark/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ elif ! [ -z ${SPARK_HOME+x} ]; then
SPARK_CLASSPATH="$SPARK_HOME/conf:$SPARK_CLASSPATH";
fi

# SPARK-43540: add current working directory into executor classpath
SPARK_CLASSPATH="$SPARK_CLASSPATH:$PWD"

case "$1" in
driver)
shift 1
Expand Down