Skip to content
This repository has been archived by the owner on Jan 9, 2020. It is now read-only.

Explicitly disable "waiting for app completion" behavior for the integration tests #84

Merged
merged 1 commit into from
Feb 3, 2017
Merged

Explicitly disable "waiting for app completion" behavior for the integration tests #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions ...s/src/test/scala/org/apache/spark/deploy/kubernetes/integrationtest/KubernetesSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
.set("spark.app.name", "spark-pi")
.set("spark.ui.enabled", "true")
.set("spark.testing", "false")
.set("spark.kubernetes.submit.waitAppCompletion", "false")
val mainAppResource = s"file://$EXAMPLES_JAR"

new Client(
Expand Down Expand Up @@ -210,6 +211,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
"--conf", s"spark.kubernetes.submit.clientCertFile=${clientConfig.getClientCertFile}",
"--conf", "spark.kubernetes.executor.docker.image=spark-executor:latest",
"--conf", "spark.kubernetes.driver.docker.image=spark-driver:latest",
"--conf", "spark.kubernetes.submit.waitAppCompletion=false",
EXAMPLES_JAR)
SparkSubmit.main(args)
val sparkMetricsService = getSparkMetricsService("spark-pi")
Expand All @@ -231,6 +233,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
"--conf", s"spark.kubernetes.submit.clientCertFile=${clientConfig.getClientCertFile}",
"--conf", "spark.kubernetes.executor.docker.image=spark-executor:latest",
"--conf", "spark.kubernetes.driver.docker.image=spark-driver:latest",
"--conf", "spark.kubernetes.submit.waitAppCompletion=false",
s"container:///opt/spark/examples/jars/$EXAMPLES_JAR_FILE_NAME")
val allContainersSucceeded = SettableFuture.create[Boolean]
val watcher = new Watcher[Pod] {
Expand Down Expand Up @@ -292,6 +295,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
"--conf", "spark.kubernetes.executor.docker.image=spark-executor:latest",
"--conf", "spark.kubernetes.driver.docker.image=spark-driver:latest",
"--conf", "spark.kubernetes.driver.labels=label1=label1value,label2=label2value",
"--conf", "spark.kubernetes.submit.waitAppCompletion=false",
EXAMPLES_JAR)
SparkSubmit.main(args)
val driverPodLabels = minikubeKubernetesClient
Expand Down Expand Up @@ -337,6 +341,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
"--conf", "spark.ssl.kubernetes.submit.trustStore=" +
s"file://${trustStoreFile.getAbsolutePath}",
"--conf", s"spark.ssl.kubernetes.driverlaunch.trustStorePassword=changeit",
"--conf", "spark.kubernetes.submit.waitAppCompletion=false",
EXAMPLES_JAR)
SparkSubmit.main(args)
}
Expand All @@ -360,6 +365,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
"--conf", s"spark.kubernetes.submit.clientCertFile=${clientConfig.getClientCertFile}",
"--conf", "spark.kubernetes.executor.docker.image=spark-executor:latest",
"--conf", "spark.kubernetes.driver.docker.image=spark-driver:latest",
"--conf", "spark.kubernetes.submit.waitAppCompletion=false",
EXAMPLES_JAR,
TEST_EXISTENCE_FILE.getName,
TEST_EXISTENCE_FILE_CONTENTS)
Expand Down