Skip to content

[SPARK-40635][YARN][TESTS] Fix yarn module daily test failed with hadoop2 #38079

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
LuciferYang wants to merge 8 commits into from
Closed

[SPARK-40635][YARN][TESTS] Fix yarn module daily test failed with hadoop2 #38079

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e8e6b7f
try filter some test deps from classpath
LuciferYang Oct 3, 2022
5ad8024
test hadoop 2
LuciferYang Oct 2, 2022
93bdf77
try dedup
LuciferYang Oct 3, 2022
64f0e0b
use File.pathSeparator
LuciferYang Oct 3, 2022
b17b27f
test hadoop3
LuciferYang Oct 3, 2022
bd89c95
do de duplication only when Utils.isTesting is true
LuciferYang Oct 5, 2022
4e9a0d8
re test haddop2
LuciferYang Oct 5, 2022
2712ae0
add comments and re-test hadoop-3
LuciferYang Oct 5, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ on:
description: Hadoop version to run with. HADOOP_PROFILE environment variable should accept it.
required: false
type: string
default: hadoop3
default: hadoop2

@LuciferYang LuciferYang Oct 3, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

for test hadoop-2, will revert after confirmation takes effect

envs:
description: Additional environment variables to set when running the tests. Should be in JSON format.
required: false
Expand Down
11 changes: 10 additions & 1 deletion resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,8 @@ private[spark] object Client extends Logging {

val SPARK_TESTING = "SPARK_TESTING"

val CLASS_PATH_SEPARATOR = ":"

/**
* Return the path to the given application's staging directory.
*/
Expand Down Expand Up @@ -1470,6 +1472,11 @@ private[spark] object Client extends Logging {
addClasspathEntry(getClusterPath(sparkConf, cp), env)
}

val cpSet = extraClassPath match {
case Some(classPath) => classPath.split(CLASS_PATH_SEPARATOR).toSet
case _ => Set.empty[String]
}

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

addClasspathEntry(Environment.PWD.$$() + Path.SEPARATOR + LOCALIZED_CONF_DIR, env)
Expand Down Expand Up @@ -1513,7 +1520,9 @@ private[spark] object Client extends Logging {
}

sys.env.get(ENV_DIST_CLASSPATH).foreach { cp =>
addClasspathEntry(getClusterPath(sparkConf, cp), env)
val newCp = cp.split(CLASS_PATH_SEPARATOR)
.filterNot(cpSet.contains).mkString(CLASS_PATH_SEPARATOR)
addClasspathEntry(getClusterPath(sparkConf, newCp), env)

@LuciferYang LuciferYang Oct 3, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Try to deduplicate jars that have been added to CLASSPATH through extraClassPath

@LuciferYang LuciferYang Oct 3, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Is it necessary to change it to

      val newCp = if (Utils.isTesting) {
        cp.split(File.pathSeparator)
          .filterNot(cpSet.contains).mkString(File.pathSeparator)
      } else cp

but I think de duplication may also be useful for the production environment

}

// Add the localized Hadoop config at the end of the classpath, in case it contains other
Expand Down