dongjoon-hyun commented on a change in pull request #30283:
URL: https://github.com/apache/spark/pull/30283#discussion_r523704337
##########
File path:
resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/KubernetesClientApplication.scala
##########
@@ -133,29 +136,37 @@ private[spark] class Client(
.endVolume()
.endSpec()
.build()
- Utils.tryWithResource(
- kubernetesClient
- .pods()
- .withName(resolvedDriverPod.getMetadata.getName)
- .watch(watcher)) { _ =>
- val createdDriverPod = kubernetesClient.pods().create(resolvedDriverPod)
- try {
- val otherKubernetesResources =
- resolvedDriverSpec.driverKubernetesResources ++ Seq(configMap)
- addDriverOwnerReference(createdDriverPod, otherKubernetesResources)
- kubernetesClient.resourceList(otherKubernetesResources:
_*).createOrReplace()
- } catch {
- case NonFatal(e) =>
- kubernetesClient.pods().delete(createdDriverPod)
- throw e
- }
- if (waitForAppCompletion) {
- logInfo(s"Waiting for application $appName to finish...")
- watcher.awaitCompletion()
- logInfo(s"Application $appName finished.")
- } else {
- logInfo(s"Deployed Spark application $appName into Kubernetes.")
+ val driverPodName = resolvedDriverPod.getMetadata.getName
+ var watch: Watch = null
+ val createdDriverPod = kubernetesClient.pods().create(resolvedDriverPod)
+ try {
+ val otherKubernetesResources =
resolvedDriverSpec.driverKubernetesResources ++ Seq(configMap)
+ addDriverOwnerReference(createdDriverPod, otherKubernetesResources)
+ kubernetesClient.resourceList(otherKubernetesResources:
_*).createOrReplace()
+ } catch {
+ case NonFatal(e) =>
+ kubernetesClient.pods().delete(createdDriverPod)
+ throw e
+ }
+ val sId = Seq(kubernetesConf.namespace(), driverPodName).mkString(":")
+ breakable {
+ while (true) {
+ val podWithName = kubernetesClient
+ .pods()
+ .withName(driverPodName)
+
+ watcher.reset()
+
+ watch = podWithName.watch(watcher)
+
+ watcher.eventReceived(Action.MODIFIED, podWithName.get())
+
+ if(watcher.watchOrStop(sId)) {
+ logInfo(s"Stop watching as the pod has completed.")
Review comment:
Let's remove this. Otherwise this exists only at `branch-2.4`. People
can be confused and think as a regression at branch-3.0 and `master`.
----------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
