This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 6ad5756 [MINOR][K8S] Print the driver pod name instead of Some(name)
if absent
6ad5756 is described below
commit 6ad5756b8ca5241e3c747096282fff32c60dd2c3
Author: Kent Yao <y...@apache.org>
AuthorDate: Sun Jun 13 09:11:14 2021 -0700
[MINOR][K8S] Print the driver pod name instead of Some(name) if absent
Print the driver pod name instead of Some(name) if absent
fix error hint
no
new test
Closes #32889 from yaooqinn/minork8s.
Authored-by: Kent Yao <y...@apache.org>
Signed-off-by: Dongjoon Hyun <dongj...@apache.org>
(cherry picked from commit 1125afd4622e6d3f7f14fca1ebcfebdfba6d9529)
Signed-off-by: Dongjoon Hyun <dongj...@apache.org>
---
.../scheduler/cluster/k8s/ExecutorPodsAllocator.scala | 2 +-
.../scheduler/cluster/k8s/ExecutorPodsAllocatorSuite.scala | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git
a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocator.scala
b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocator.scala
index 5429e36..c83b8b8 100644
---
a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocator.scala
+++
b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocator.scala
@@ -78,7 +78,7 @@ private[spark] class ExecutorPodsAllocator(
.withName(name)
.get())
.getOrElse(throw new SparkException(
- s"No pod was found named $kubernetesDriverPodName in the cluster in
the " +
+ s"No pod was found named $name in the cluster in the " +
s"namespace $namespace (this was supposed to be the driver pod.).")))
// Executor IDs that have been requested from Kubernetes but have not been
detected in any
diff --git
a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocatorSuite.scala
b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocatorSuite.scala
index ed6ca2a..7ec1729 100644
---
a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocatorSuite.scala
+++
b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocatorSuite.scala
@@ -28,7 +28,7 @@ import org.mockito.invocation.InvocationOnMock
import org.mockito.stubbing.Answer
import org.scalatest.BeforeAndAfter
-import org.apache.spark.{SecurityManager, SparkConf, SparkFunSuite}
+import org.apache.spark.{SecurityManager, SparkConf, SparkException,
SparkFunSuite}
import org.apache.spark.deploy.k8s.{KubernetesExecutorConf,
KubernetesExecutorSpec}
import org.apache.spark.deploy.k8s.Config._
import org.apache.spark.deploy.k8s.Constants._
@@ -570,6 +570,18 @@ class ExecutorPodsAllocatorSuite extends SparkFunSuite
with BeforeAndAfter {
verify(podOperations).create(podWithAttachedContainerForId(6))
}
+ test("print the pod name instead of Some(name) if pod is absent") {
+ val nonexistentPod = "i-do-not-exist"
+ val conf = new SparkConf().set(KUBERNETES_DRIVER_POD_NAME, nonexistentPod)
+ when(kubernetesClient.pods()).thenReturn(podOperations)
+
when(podOperations.withName(nonexistentPod)).thenReturn(driverPodOperations)
+ when(driverPodOperations.get()).thenReturn(null)
+ val e = intercept[SparkException](new ExecutorPodsAllocator(
+ conf, secMgr, executorBuilder, kubernetesClient, snapshotsStore,
waitForExecutorPodsClock))
+ assert(e.getMessage.contains("No pod was found named i-do-not-exist in the
cluster in the" +
+ " namespace default"))
+ }
+
private def executorPodAnswer(): Answer[KubernetesExecutorSpec] =
(invocation: InvocationOnMock) => {
val k8sConf: KubernetesExecutorConf = invocation.getArgument(0)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
