skonto commented on a change in pull request #23599: [SPARK-24793][K8s] Enhance spark-submit for app management URL: https://github.com/apache/spark/pull/23599#discussion_r266050139
########## File path: resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/submit/K8sSubmitOpSuite.scala ########## @@ -0,0 +1,160 @@ +/* + * 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.submit + +import java.io.PrintStream + +import scala.collection.JavaConverters._ + +import io.fabric8.kubernetes.api.model._ +import io.fabric8.kubernetes.client.KubernetesClient +import io.fabric8.kubernetes.client.dsl.PodResource +import org.mockito.{ArgumentMatchers, Mock, MockitoAnnotations} +import org.mockito.Mockito.{times, verify, when} +import org.scalatest.BeforeAndAfter + +import org.apache.spark.{SparkConf, SparkFunSuite} +import org.apache.spark.deploy.k8s.Config.KUBERNETES_SUBMIT_GRACE_PERIOD +import org.apache.spark.deploy.k8s.Constants.{SPARK_APP_ID_LABEL, SPARK_POD_DRIVER_ROLE, SPARK_ROLE_LABEL} +import org.apache.spark.deploy.k8s.Fabric8Aliases.PODS +import org.apache.spark.scheduler.cluster.k8s.ExecutorLifecycleTestUtils.TEST_SPARK_APP_ID + +class K8sSubmitOpSuite extends SparkFunSuite with BeforeAndAfter { + private val oldErr = System.err + private val driverPodName1 = "driver1" + private val driverPodName2 = "driver2" + private val driverPod1 = buildDriverPod(driverPodName1, "1") + private val driverPod2 = buildDriverPod(driverPodName2, "2") + private val podList = List(driverPod1, driverPod2) + private val namespace = "test" + + @Mock + private var podOperations: PODS = _ + + @Mock + private var driverPodOperations1: PodResource[Pod, DoneablePod] = _ + + @Mock + private var driverPodOperations2: PodResource[Pod, DoneablePod] = _ + + @Mock + private var kubernetesClient: KubernetesClient = _ + + @Mock + private var err: PrintStream = _ + + before { + MockitoAnnotations.initMocks(this) + when(kubernetesClient.pods()).thenReturn(podOperations) + when(podOperations.inNamespace(namespace)).thenReturn(podOperations) + when(podOperations.delete(podList.asJava)).thenReturn(true) + when(podOperations.withName(driverPodName1)).thenReturn(driverPodOperations1) + when(podOperations.withName(driverPodName2)).thenReturn(driverPodOperations2) + when(driverPodOperations1.get).thenReturn(driverPod1) + when(driverPodOperations1.delete()).thenReturn(true) + when(driverPodOperations2.get).thenReturn(driverPod2) + when(driverPodOperations2.delete()).thenReturn(true) + } + + test("List app status") { + System.setErr(err) + implicit val kubeClient: KubernetesClient = kubernetesClient + val listStatus = new ListStatus + listStatus.executeOnPod(driverPodName1, Option(namespace), new SparkConf()) + // scalastyle:off + verify(err).println(ArgumentMatchers.eq(getPodStatus(driverPodName1, "1"))) + // scalastyle:on + System.setErr(oldErr) + } + + test("List status for multiple apps with glob") { + System.setErr(err) Review comment: Initially I had it this way in these blocks but I kept it outside there because i affects only a subset of the tests. I can put it back. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to 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 With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
