[SPARK-12559][SPARK SUBMIT] fix --packages for stand-alone cluster mode #18630
There are no files selected for viewing
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,100 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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 org.apache.spark.deploy | ||
|
|
||
| import java.io.File | ||
| import java.nio.file.Files | ||
|
|
||
| import scala.collection.mutable.HashMap | ||
|
|
||
| import org.apache.commons.io.FileUtils | ||
| import org.apache.commons.lang3.StringUtils | ||
| import org.apache.hadoop.conf.Configuration | ||
|
|
||
| import org.apache.spark.util.MutableURLClassLoader | ||
|
|
||
| private[deploy] object DependencyUtils { | ||
|
|
||
| def resolveMavenDependencies( | ||
| packagesExclusions: String, | ||
| packages: String, | ||
| repositories: String, | ||
| ivyRepoPath: String): String = { | ||
| val exclusions: Seq[String] = | ||
| if (!StringUtils.isBlank(packagesExclusions)) { | ||
| packagesExclusions.split(",") | ||
| } else { | ||
| Nil | ||
| } | ||
| // Create the IvySettings, either load from file or build defaults | ||
| val ivySettings = sys.props.get("spark.jars.ivySettings").map { ivySettingsFile => | ||
| SparkSubmitUtils.loadIvySettings(ivySettingsFile, Option(repositories), | ||
| Option(ivyRepoPath)) | ||
|
||
| }.getOrElse { | ||
| SparkSubmitUtils.buildIvySettings(Option(repositories), Option(ivyRepoPath)) | ||
| } | ||
|
|
||
| SparkSubmitUtils.resolveMavenCoordinates(packages, ivySettings, exclusions = exclusions) | ||
| } | ||
|
|
||
| def createTempDir(): File = { | ||
|
||
| val targetDir = Files.createTempDirectory("tmp").toFile | ||
| // scalastyle:off runtimeaddshutdownhook | ||
|
||
| Runtime.getRuntime.addShutdownHook(new Thread() { | ||
| override def run(): Unit = { | ||
| FileUtils.deleteQuietly(targetDir) | ||
| } | ||
| }) | ||
| // scalastyle:on runtimeaddshutdownhook | ||
| targetDir | ||
| } | ||
|
|
||
| def resolveAndDownloadJars(jars: String, userJar: String): String = { | ||
| val targetDir = DependencyUtils.createTempDir() | ||
| val hadoopConf = new Configuration() | ||
| val sparkProperties = new HashMap[String, String]() | ||
| val securityProperties = List("spark.ssl.fs.trustStore", "spark.ssl.trustStore", | ||
| "spark.ssl.fs.trustStorePassword", "spark.ssl.trustStorePassword", | ||
| "spark.ssl.fs.protocol", "spark.ssl.protocol") | ||
|
|
||
| securityProperties.foreach { pName => | ||
| sys.props.get(pName).foreach { pValue => | ||
| sparkProperties.put(pName, pValue) | ||
| } | ||
| } | ||
|
|
||
| Option(jars) | ||
| .map { | ||
| SparkSubmit.resolveGlobPaths(_, hadoopConf) | ||
| .split(",") | ||
| .filterNot(_.contains(userJar.split("/").last)) | ||
| .mkString(",") | ||
| } | ||
| .filterNot(_ == "") | ||
| .map(SparkSubmit.downloadFileList(_, targetDir, sparkProperties, hadoopConf)) | ||
| .orNull | ||
| } | ||
|
|
||
| def addJarsToClassPath(jars: String, loader: MutableURLClassLoader): Unit = { | ||
| if (jars != null) { | ||
| for (jar <- jars.split(",")) { | ||
| SparkSubmit.addJarToClasspath(jar, loader) | ||
| } | ||
| } | ||
| } | ||
| } | ||
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
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.
Do we really need this new object? It make the order of calls confusing. For instance SparkSubmit calls DependencyUtils which makes calls to SparkSubmitUtils. Can we just move this to SparkSubmitUtils?
Uh oh!
There was an error while loading. Please reload this page.
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.
I asked for this change, because
SparkSubmitUtilsis kind of a bad place to keep this code if things other thanSparkSubmitstart using it. The calls intoSparkSubmitUtilsare not optimal but those can be refactored separately.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.
Ok, that's fine if you are thinking the calls back to
SparkSubmitUtilscan be moved here eventually.