Skip to content

[SPARK-22757][Kubernetes] Enable use of remote dependencies (http, s3, gcs, etc.) in Kubernetes mode #19954

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
liyinan926 wants to merge 14 commits into from
Closed

[SPARK-22757][Kubernetes] Enable use of remote dependencies (http, s3, gcs, etc.) in Kubernetes mode #19954

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d3cbbdd
[SPARK-22757][Kubernetes] Enable use of remote dependencies in Kubern…
liyinan926 Dec 12, 2017
5d2cbc8
Addressed first round of comments
liyinan926 Dec 15, 2017
4ee76af
Addressed the second round of comments
liyinan926 Dec 16, 2017
9c8051a
Create one task per jar/file to download in the init-container
liyinan926 Dec 16, 2017
1f65417
More review comments
liyinan926 Dec 18, 2017
109ad80
Shorten variable names
liyinan926 Dec 19, 2017
c21fdcf
Removed traits that have only a single implementation
liyinan926 Dec 19, 2017
a3cd71d
Remove unused class arguments
liyinan926 Dec 19, 2017
23c5cd9
Improved documentation
liyinan926 Dec 19, 2017
2ec15c4
Addressed latest round of comments
liyinan926 Dec 20, 2017
5d1f889
Addressed more comments
liyinan926 Dec 21, 2017
9d9c841
Updated names of two configuration properties
liyinan926 Dec 22, 2017
c51bc56
Addressed more comments
liyinan926 Dec 25, 2017
28343fb
Addressed one more comment
liyinan926 Dec 26, 2017
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
Prev Previous commit
Next Next commit
More review comments
  • Loading branch information
@liyinan926
liyinan926 committed Dec 23, 2017
commit 1f65417b234bddc9ff16a5a52d6082cda9a8bea4
4 changes: 2 additions & 2 deletions ...etes/core/src/main/scala/org/apache/spark/deploy/rest/k8s/SparkConfPropertiesParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ private[spark] object SparkConfPropertiesParser {
val sparkConf = new SparkConf(true)

if (!propertiesFile.isFile) {
throw new IllegalArgumentException(s"Server properties file given at" +
s" ${propertiesFile.getAbsoluteFile} does not exist or is not a file.")
throw new IllegalArgumentException("Server properties file given at " +
s"${propertiesFile.getAbsoluteFile} does not exist or is not a file.")
}

val properties = new Properties
Expand Down
4 changes: 2 additions & 2 deletions ...ore/src/test/scala/org/apache/spark/deploy/k8s/submit/DriverConfigOrchestratorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ class DriverConfigOrchestratorSuite extends SparkFunSuite {
}

private def validateStepTypes(
orchestrator: DriverConfigOrchestrator,
types: Class[_ <: DriverConfigurationStep]*): Unit = {
orchestrator: DriverConfigOrchestrator,
types: Class[_ <: DriverConfigurationStep]*): Unit = {
val steps = orchestrator.getAllConfigurationSteps()
assert(steps.size === types.size)
assert(steps.map(_.getClass) === types)
Expand Down
28 changes: 14 additions & 14 deletions ...cala/org/apache/spark/deploy/k8s/submit/steps/DriverInitContainerBootstrapStepSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ class DriverInitContainerBootstrapStepSuite extends SparkFunSuite {
driverSparkConf = new SparkConf(false),
otherKubernetesResources = Seq.empty[HasMetadata])
val initContainerSteps = Seq(
FirstTestInitContainerConfigurationStep$,
SecondTestInitContainerConfigurationStep$)
FirstTestInitContainerConfigurationStep,
SecondTestInitContainerConfigurationStep)
val bootstrapStep = new DriverInitContainerBootstrapStep(
initContainerSteps,
CONFIG_MAP_NAME,
Expand All @@ -52,17 +52,17 @@ class DriverInitContainerBootstrapStepSuite extends SparkFunSuite {
val preparedDriverSpec = bootstrapStep.configureDriver(baseDriverSpec)

assert(preparedDriverSpec.driverPod.getMetadata.getLabels.asScala ===
FirstTestInitContainerConfigurationStep$.additionalLabels)
FirstTestInitContainerConfigurationStep.additionalLabels)
val additionalDriverEnv = preparedDriverSpec.driverContainer.getEnv.asScala
assert(additionalDriverEnv.size === 1)
assert(additionalDriverEnv.head.getName ===
FirstTestInitContainerConfigurationStep$.additionalMainContainerEnvKey)
FirstTestInitContainerConfigurationStep.additionalMainContainerEnvKey)
assert(additionalDriverEnv.head.getValue ===
FirstTestInitContainerConfigurationStep$.additionalMainContainerEnvValue)
FirstTestInitContainerConfigurationStep.additionalMainContainerEnvValue)

assert(preparedDriverSpec.otherKubernetesResources.size === 2)
assert(preparedDriverSpec.otherKubernetesResources.contains(
FirstTestInitContainerConfigurationStep$.additionalKubernetesResource))
FirstTestInitContainerConfigurationStep.additionalKubernetesResource))
assert(preparedDriverSpec.otherKubernetesResources.exists {
case configMap: ConfigMap =>
val hasMatchingName = configMap.getMetadata.getName == CONFIG_MAP_NAME
Expand All @@ -75,8 +75,8 @@ class DriverInitContainerBootstrapStepSuite extends SparkFunSuite {
}
val initContainerPropertiesMap = Maps.fromProperties(initContainerProperties).asScala
val expectedInitContainerProperties = Map(
SecondTestInitContainerConfigurationStep$.additionalInitContainerPropertyKey ->
SecondTestInitContainerConfigurationStep$.additionalInitContainerPropertyValue)
SecondTestInitContainerConfigurationStep.additionalInitContainerPropertyKey ->
SecondTestInitContainerConfigurationStep.additionalInitContainerPropertyValue)
val hasMatchingProperties = initContainerPropertiesMap == expectedInitContainerProperties
hasMatchingName && hasCorrectNumberOfEntries && hasMatchingProperties
case _ => false
Copy link
Contributor

@vanzin vanzin Dec 21, 2017

Choose a reason for hiding this comment

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

Add empty line before this.

Expand All @@ -87,20 +87,20 @@ class DriverInitContainerBootstrapStepSuite extends SparkFunSuite {
val initContainerEnv = initContainers.get(0).getEnv.asScala
assert(initContainerEnv.size === 1)
assert(initContainerEnv.head.getName ===
SecondTestInitContainerConfigurationStep$.additionalInitContainerEnvKey)
SecondTestInitContainerConfigurationStep.additionalInitContainerEnvKey)
assert(initContainerEnv.head.getValue ===
SecondTestInitContainerConfigurationStep$.additionalInitContainerEnvValue)
SecondTestInitContainerConfigurationStep.additionalInitContainerEnvValue)

val expectedSparkConf = Map(
INIT_CONTAINER_CONFIG_MAP_NAME.key -> CONFIG_MAP_NAME,
INIT_CONTAINER_CONFIG_MAP_KEY_CONF.key -> CONFIG_MAP_KEY,
SecondTestInitContainerConfigurationStep$.additionalDriverSparkConfKey ->
SecondTestInitContainerConfigurationStep$.additionalDriverSparkConfValue)
SecondTestInitContainerConfigurationStep.additionalDriverSparkConfKey ->
SecondTestInitContainerConfigurationStep.additionalDriverSparkConfValue)
assert(preparedDriverSpec.driverSparkConf.getAll.toMap === expectedSparkConf)
}
}

private object FirstTestInitContainerConfigurationStep$ extends InitContainerConfigurationStep {
private object FirstTestInitContainerConfigurationStep extends InitContainerConfigurationStep {

val additionalLabels = Map("additionalLabelkey" -> "additionalLabelValue")
val additionalMainContainerEnvKey = "TEST_ENV_MAIN_KEY"
Expand Down Expand Up @@ -132,7 +132,7 @@ private object FirstTestInitContainerConfigurationStep$ extends InitContainerCon
}
}

private object SecondTestInitContainerConfigurationStep$ extends InitContainerConfigurationStep {
private object SecondTestInitContainerConfigurationStep extends InitContainerConfigurationStep {
val additionalInitContainerEnvKey = "TEST_ENV_INIT_KEY"
val additionalInitContainerEnvValue = "TEST_ENV_INIT_VALUE"
val additionalInitContainerPropertyKey = "spark.initcontainer.testkey"
Expand Down