[
https://issues.apache.org/jira/browse/SPARK-25877?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16716025#comment-16716025
]
ASF GitHub Bot commented on SPARK-25877:
----------------------------------------
mccheah commented on a change in pull request #23220: [SPARK-25877][k8s] Move
all feature logic to feature classes.
URL: https://github.com/apache/spark/pull/23220#discussion_r240454265
##########
File path:
resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/PodBuilderSuite.scala
##########
@@ -0,0 +1,177 @@
+/*
+ * 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
+
+import java.io.File
+
+import io.fabric8.kubernetes.api.model.{Config => _, _}
+import io.fabric8.kubernetes.client.KubernetesClient
+import io.fabric8.kubernetes.client.dsl.{MixedOperation, PodResource}
+import org.mockito.Matchers.any
+import org.mockito.Mockito.{mock, never, verify, when}
+import scala.collection.JavaConverters._
+
+import org.apache.spark.{SparkConf, SparkException, SparkFunSuite}
+import org.apache.spark.deploy.k8s._
+import org.apache.spark.internal.config.ConfigEntry
+
+abstract class PodBuilderSuite extends SparkFunSuite {
+
+ protected def templateFileConf: ConfigEntry[_]
+
+ protected def buildPod(sparkConf: SparkConf, client: KubernetesClient):
SparkPod
+
+ private val baseConf = new SparkConf(false)
+ .set(Config.CONTAINER_IMAGE, "spark-executor:latest")
+
+ test("use empty initial pod if template is not specified") {
+ val client = mock(classOf[KubernetesClient])
+ buildPod(baseConf.clone(), client)
+ verify(client, never()).pods()
+ }
+
+ test("load pod template if specified") {
+ val client = mockKubernetesClient()
+ val sparkConf = baseConf.clone().set(templateFileConf.key,
"template-file.yaml")
+ val pod = buildPod(sparkConf, client)
+ verifyPod(pod)
+ }
+
+ test("complain about misconfigured pod template") {
+ val client = mockKubernetesClient(
+ new PodBuilder()
+ .withNewMetadata()
+ .addToLabels("test-label-key", "test-label-value")
+ .endMetadata()
+ .build())
+ val sparkConf = baseConf.clone().set(templateFileConf.key,
"template-file.yaml")
+ val exception = intercept[SparkException] {
+ buildPod(sparkConf, client)
+ }
+ assert(exception.getMessage.contains("Could not load pod from template
file."))
+ }
+
+ private def mockKubernetesClient(pod: Pod = podWithSupportedFeatures()):
KubernetesClient = {
+ val kubernetesClient = mock(classOf[KubernetesClient])
+ val pods =
+ mock(classOf[MixedOperation[Pod, PodList, DoneablePod, PodResource[Pod,
DoneablePod]]])
+ val podResource = mock(classOf[PodResource[Pod, DoneablePod]])
+ when(kubernetesClient.pods()).thenReturn(pods)
+ when(pods.load(any(classOf[File]))).thenReturn(podResource)
+ when(podResource.get()).thenReturn(pod)
+ kubernetesClient
+ }
+
+ private def verifyPod(pod: SparkPod): Unit = {
+ val metadata = pod.pod.getMetadata
+ assert(metadata.getLabels.containsKey("test-label-key"))
+ assert(metadata.getAnnotations.containsKey("test-annotation-key"))
+ assert(metadata.getNamespace === "namespace")
+ assert(metadata.getOwnerReferences.asScala.exists(_.getName ==
"owner-reference"))
+ val spec = pod.pod.getSpec
+ assert(!spec.getContainers.asScala.exists(_.getName ==
"executor-container"))
+ assert(spec.getDnsPolicy === "dns-policy")
+ assert(spec.getHostAliases.asScala.exists(_.getHostnames.asScala.exists(_
== "hostname")))
Review comment:
Nit: The second call to `exists` can be `contains` instead, so that we don't
pass a function object that ignores the argument. Alternatively, both `exists`
calls can be removed:
```
spec.getHostAliases.asScala.flatMap(_.getHostnames).contains("hostname")
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Put all feature-related code in the feature step itself
> -------------------------------------------------------
>
> Key: SPARK-25877
> URL: https://issues.apache.org/jira/browse/SPARK-25877
> Project: Spark
> Issue Type: Improvement
> Components: Kubernetes
> Affects Versions: 2.4.0
> Reporter: Marcelo Vanzin
> Priority: Major
>
> This is a child task of SPARK-25874. It covers having all the code related to
> features in the feature steps themselves, including logic about whether a
> step should be applied or not.
> Please refer to the parent bug for further details.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@spark.apache.org
For additional commands, e-mail: issues-h...@spark.apache.org
