Add initial integration test code #3
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,220 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ 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. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>spark-kubernetes-integration-tests_2.11</artifactId> | ||
| <groupId>spark-kubernetes-integration-tests</groupId> | ||
| <version>0.1-SNAPSHOT</version> | ||
| <properties> | ||
| <commons-lang3.version>3.5</commons-lang3.version> | ||
| <jsr305.version>1.3.9</jsr305.version> | ||
| <kubernetes.client.version>3.0.0</kubernetes.client.version> | ||
| <log4j.version>1.2.17</log4j.version> | ||
| <scala.version>2.11.8</scala.version> | ||
| <scala.binary.version>2.11</scala.binary.version> | ||
| <sbt.project.name>kubernetes-integration-tests</sbt.project.name> | ||
| <spark-distro-tgz>YOUR-SPARK-DISTRO-TARBALL-HERE</spark-distro-tgz> | ||
| <spark-dockerfiles-dir>YOUR-DOCKERFILES-DIR-HERE</spark-dockerfiles-dir> | ||
| </properties> | ||
| <packaging>jar</packaging> | ||
| <name>Spark Project Kubernetes Integration Tests</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>commons-logging</groupId> | ||
| <artifactId>commons-logging</artifactId> | ||
| <version>1.1.1</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.code.findbugs</groupId> | ||
| <artifactId>jsr305</artifactId> | ||
| <version>${jsr305.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.guava</groupId> | ||
| <artifactId>guava</artifactId> | ||
| <scope>test</scope> | ||
| <!-- For compatibility with Docker client. Should be fine since this is just for tests.--> | ||
| <version>18.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.spotify</groupId> | ||
| <artifactId>docker-client</artifactId> | ||
| <version>5.0.2</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.fabric8</groupId> | ||
| <artifactId>kubernetes-client</artifactId> | ||
| <version>${kubernetes.client.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>log4j</groupId> | ||
| <artifactId>log4j</artifactId> | ||
| <version>${log4j.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.commons</groupId> | ||
| <artifactId>commons-lang3</artifactId> | ||
| <version>${commons-lang3.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.scala-lang</groupId> | ||
| <artifactId>scala-library</artifactId> | ||
| <version>${scala.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.scalatest</groupId> | ||
| <artifactId>scalatest_${scala.binary.version}</artifactId> | ||
| <version>2.2.6</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <version>3.2.2</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>compile</goal> | ||
| <goal>testCompile</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>exec-maven-plugin</artifactId> | ||
| <version>1.4.0</version> | ||
| <executions> | ||
| <execution> | ||
| <id>unpack-spark-distro</id> | ||
| <phase>pre-integration-test</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <workingDirectory>${project.build.directory}</workingDirectory> | ||
| <executable>/bin/sh</executable> | ||
| <arguments> | ||
| <argument>-c</argument> | ||
| <argument>mkdir spark-distro-tmp; cd spark-distro-tmp; tar xfz ${spark-distro-tgz}; mv * ../spark-distro; cd ..; rm -rf spark-distro-tmp</argument> | ||
| </arguments> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <!-- TODO: Remove this hack once the upstream is fixed --> | ||
| <id>copy-dockerfiles-if-missing</id> | ||
| <phase>pre-integration-test</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <workingDirectory>${project.build.directory}/spark-distro</workingDirectory> | ||
| <executable>/bin/sh</executable> | ||
| <arguments> | ||
| <argument>-c</argument> | ||
| <argument>test -d dockerfiles || cp -pr ${spark-dockerfiles-dir} dockerfiles</argument> | ||
| </arguments> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <!-- TODO: Remove this hack once the upstream is fixed --> | ||
| <id>set-exec-bit-on-docker-entrypoint-sh</id> | ||
|
There was a problem hiding this comment. Just set it in the There was a problem hiding this comment. I think that's better to be done by the upstream code. It's hard for this integration code to surgically do in-place edit of Dockerfile. |
||
| <phase>pre-integration-test</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <workingDirectory>${project.build.directory}/spark-distro/dockerfiles</workingDirectory> | ||
| <executable>/bin/chmod</executable> | ||
| <arguments> | ||
| <argument>+x</argument> | ||
| <argument>spark-base/entrypoint.sh</argument> | ||
| </arguments> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>com.googlecode.maven-download-plugin</groupId> | ||
| <artifactId>download-maven-plugin</artifactId> | ||
| <version>1.3.0</version> | ||
| <executions> | ||
| <execution> | ||
| <id>download-minikube-linux</id> | ||
|
There was a problem hiding this comment. We shouldn't be downloading here, we should be using the built-in Minikube binary. There was a problem hiding this comment. I agree that's what we want, but I suggest we address this in a future PR. I think we'd like to start testing the upstream sooner than later. There was a problem hiding this comment. I think the Riselab nodes where we are running this will have Minikube installed already, as it assumes the setup where the Minikube instance is being re-used. There was a problem hiding this comment. So it should be just as easy to use the pre-installed minikube as it would be to download a new one every time. That is, the total time from now to when the tests start running against upstream should be equivalent regardless of which branch we use - so we should use the more robust mode from the start. There was a problem hiding this comment. Copying my reply from below: I am not familiar with #521 yet. So I don't know how much extra time it would need to address the code and potential review comments that the new code would invite. And I personally don't have a lot of extra time to spend on this beyond what I spent already. I also don't know much about the riselab setup. I was hoping to delay that until @ssuchter comes back. We can use Pepperdata jenkins in the meantime. So I really hope that we can keep this PR simple and address gaps in future PRs. |
||
| <phase>pre-integration-test</phase> | ||
| <goals> | ||
| <goal>wget</goal> | ||
| </goals> | ||
| <configuration> | ||
| <url>https://storage.googleapis.com/minikube/releases/v0.22.0/minikube-linux-amd64</url> | ||
| <outputDirectory>${project.build.directory}/minikube-bin/linux-amd64</outputDirectory> | ||
| <outputFileName>minikube</outputFileName> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>download-minikube-darwin</id> | ||
| <phase>pre-integration-test</phase> | ||
| <goals> | ||
| <goal>wget</goal> | ||
| </goals> | ||
| <configuration> | ||
| <url>https://storage.googleapis.com/minikube/releases/v0.22.0/minikube-darwin-amd64</url> | ||
| <outputDirectory>${project.build.directory}/minikube-bin/darwin-amd64</outputDirectory> | ||
| <outputFileName>minikube</outputFileName> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <!-- Triggers scalatest plugin in the integration-test phase instead of | ||
| the test phase. --> | ||
| <groupId>org.scalatest</groupId> | ||
| <artifactId>scalatest-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>test</id> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| <configuration> | ||
| <!-- The negative pattern below prevents integration tests such as | ||
| KubernetesSuite from running in the test phase. --> | ||
| <suffixes>(?<!Suite)</suffixes> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>integration-test</id> | ||
| <phase>integration-test</phase> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
|
|
||
| </build> | ||
|
|
||
| </project> | ||
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,31 @@ | ||
| # | ||
| # 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. | ||
| # | ||
|
|
||
| # Set everything to be logged to the file target/integration-tests.log | ||
| log4j.rootCategory=INFO, file | ||
| log4j.appender.file=org.apache.log4j.FileAppender | ||
| log4j.appender.file.append=true | ||
| log4j.appender.file.file=target/integration-tests.log | ||
| log4j.appender.file.layout=org.apache.log4j.PatternLayout | ||
| log4j.appender.file.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss.SSS} %t %p %c{1}: %m%n | ||
|
|
||
| # Ignore messages below warning level from a few verbose libraries. | ||
| log4j.logger.com.sun.jersey=WARN | ||
| log4j.logger.org.apache.hadoop=WARN | ||
| log4j.logger.org.eclipse.jetty=WARN | ||
| log4j.logger.org.mortbay=WARN | ||
| log4j.logger.org.spark_project.jetty=WARN |
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,123 @@ | ||
| /* | ||
| * 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.k8s.integrationtest | ||
|
|
||
| import java.io.File | ||
| import java.nio.file.Paths | ||
| import java.util.UUID | ||
| import java.util.regex.Pattern | ||
|
|
||
| import com.google.common.io.{Files, PatternFilenameFilter} | ||
| import org.scalatest.{BeforeAndAfter, BeforeAndAfterAll, FunSuite} | ||
| import org.scalatest.concurrent.{Eventually, PatienceConfiguration} | ||
| import org.scalatest.time.{Minutes, Seconds, Span} | ||
|
|
||
| import org.apache.spark.deploy.k8s.integrationtest.backend.IntegrationTestBackendFactory | ||
| import org.apache.spark.deploy.k8s.integrationtest.constants.MINIKUBE_TEST_BACKEND | ||
| import org.apache.spark.deploy.k8s.integrationtest.constants.SPARK_DISTRO_PATH | ||
|
|
||
| private[spark] class KubernetesSuite extends FunSuite with BeforeAndAfterAll with BeforeAndAfter { | ||
| import KubernetesSuite._ | ||
|
There was a problem hiding this comment. Add an empty line before the import. |
||
| private val testBackend = IntegrationTestBackendFactory.getTestBackend() | ||
| private val APP_LOCATOR_LABEL = UUID.randomUUID().toString.replaceAll("-", "") | ||
| private var kubernetesTestComponents: KubernetesTestComponents = _ | ||
| private var sparkAppConf: SparkAppConf = _ | ||
|
|
||
| override def beforeAll(): Unit = { | ||
| testBackend.initialize() | ||
| kubernetesTestComponents = new KubernetesTestComponents(testBackend.getKubernetesClient) | ||
| } | ||
|
|
||
| override def afterAll(): Unit = { | ||
| testBackend.cleanUp() | ||
| } | ||
|
|
||
| before { | ||
| sparkAppConf = kubernetesTestComponents.newSparkAppConf() | ||
| .set("spark.kubernetes.initcontainer.docker.image", "spark-init:latest") | ||
|
There was a problem hiding this comment. The property names for images have been changed in apache/spark#19995. They need to be updated once that PR is merged. There was a problem hiding this comment. Ah, good to know. I'll leave a NOTE. Also, let me delete |
||
| .set("spark.kubernetes.driver.docker.image", "spark-driver:latest") | ||
|
There was a problem hiding this comment. It seems |
||
| .set("spark.kubernetes.driver.label.spark-app-locator", APP_LOCATOR_LABEL) | ||
| kubernetesTestComponents.createNamespace() | ||
| } | ||
|
|
||
| after { | ||
| kubernetesTestComponents.deleteNamespace() | ||
| } | ||
|
|
||
| test("Run SparkPi with no resources") { | ||
| assume(testBackend.name == MINIKUBE_TEST_BACKEND) | ||
|
|
||
| runSparkPiAndVerifyCompletion() | ||
| } | ||
|
|
||
| test("Run SparkPi with a very long application name.") { | ||
| assume(testBackend.name == MINIKUBE_TEST_BACKEND) | ||
|
|
||
| sparkAppConf.set("spark.app.name", "long" * 40) | ||
| runSparkPiAndVerifyCompletion() | ||
| } | ||
|
|
||
| private def runSparkPiAndVerifyCompletion( | ||
| appResource: String = CONTAINER_LOCAL_SPARK_DISTRO_EXAMPLES_JAR): Unit = { | ||
| runSparkApplicationAndVerifyCompletion( | ||
| appResource, | ||
| SPARK_PI_MAIN_CLASS, | ||
| Seq("Pi is roughly 3"), | ||
| Array.empty[String]) | ||
| } | ||
|
|
||
| private def runSparkApplicationAndVerifyCompletion( | ||
| appResource: String, | ||
| mainClass: String, | ||
| expectedLogOnCompletion: Seq[String], | ||
| appArgs: Array[String]): Unit = { | ||
| val appArguments = SparkAppArguments( | ||
| mainAppResource = appResource, | ||
| mainClass = mainClass) | ||
| SparkAppLauncher.launch(appArguments, sparkAppConf, TIMEOUT.value.toSeconds.toInt) | ||
| val driverPod = kubernetesTestComponents.kubernetesClient | ||
| .pods() | ||
| .withLabel("spark-app-locator", APP_LOCATOR_LABEL) | ||
| .list() | ||
| .getItems | ||
| .get(0) | ||
| Eventually.eventually(TIMEOUT, INTERVAL) { | ||
| expectedLogOnCompletion.foreach { e => | ||
| assert(kubernetesTestComponents.kubernetesClient | ||
| .pods() | ||
| .withName(driverPod.getMetadata.getName) | ||
| .getLog | ||
| .contains(e), "The application did not complete.") | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private[spark] object KubernetesSuite { | ||
|
|
||
| val TIMEOUT = PatienceConfiguration.Timeout(Span(2, Minutes)) | ||
| val INTERVAL = PatienceConfiguration.Interval(Span(2, Seconds)) | ||
| val SPARK_DISTRO_EXAMPLES_JAR_FILE: File = Paths.get(SPARK_DISTRO_PATH.toFile.getAbsolutePath, | ||
| "examples", "jars") | ||
| .toFile | ||
| .listFiles(new PatternFilenameFilter(Pattern.compile("^spark-examples_.*\\.jar$")))(0) | ||
| val CONTAINER_LOCAL_SPARK_DISTRO_EXAMPLES_JAR: String = s"local:///opt/spark/examples/jars/" + | ||
| s"${SPARK_DISTRO_EXAMPLES_JAR_FILE.getName}" | ||
| val SPARK_PI_MAIN_CLASS: String = "org.apache.spark.examples.SparkPi" | ||
|
|
||
| case object ShuffleNotReadyException extends Exception | ||
| } | ||
Oops, something went wrong.
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.
I'm not sure if we should have a universal standard of having these versions defined at the top. I'm not strongly opinionated here, but it's something to consider.
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.
It's just strange that some versions are hardcoded here while others are in constants.
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.
Sure. I can put all of them in properties.